Code Review
/
apps
/
homescreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Re-enable status bar
[apps/homescreen.git]
/
homescreen
/
homescreen.pro
diff --git
a/homescreen/homescreen.pro
b/homescreen/homescreen.pro
index
ca9ea3b
..
fd53072
100644
(file)
--- a/
homescreen/homescreen.pro
+++ b/
homescreen/homescreen.pro
@@
-14,39
+14,30
@@
# limitations under the License.
TEMPLATE = app
# limitations under the License.
TEMPLATE = app
-TARGET =
HomeS
creen
-QT = qml quick
websockets gui-private
+TARGET =
homes
creen
+QT = qml quick
gui-private dbus
CONFIG += c++11 link_pkgconfig wayland-scanner
CONFIG += c++11 link_pkgconfig wayland-scanner
-DESTDIR = $${OUT_PWD}/../package/root/bin
-PKGCONFIG += qtappfw-weather qtappfw-network qtappfw-bt afb-helpers-qt wayland-client json-c
+PKGCONFIG += wayland-client qtappfw-weather qtappfw-network qtappfw-bt
-LIBS += -lhomescreen
-
-CONFIG(release, debug|release) {
- QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET)
-}
+DBUS_INTERFACES = $$[QT_SYSROOT]/usr/share/dbus-1/interfaces/org.automotivelinux.AppLaunch.xml
SOURCES += \
src/main.cpp \
SOURCES += \
src/main.cpp \
+ src/shell.cpp \
src/statusbarmodel.cpp \
src/statusbarserver.cpp \
src/applicationlauncher.cpp \
src/mastervolume.cpp \
src/statusbarmodel.cpp \
src/statusbarserver.cpp \
src/applicationlauncher.cpp \
src/mastervolume.cpp \
- src/homescreenhandler.cpp \
- src/shell.cpp \
- src/aglsocketwrapper.cpp \
- src/chromecontroller.cpp
+ src/homescreenhandler.cpp
HEADERS += \
HEADERS += \
+ src/shell.h \
+ src/constants.h \
src/statusbarmodel.h \
src/statusbarserver.h \
src/applicationlauncher.h \
src/mastervolume.h \
src/statusbarmodel.h \
src/statusbarserver.h \
src/applicationlauncher.h \
src/mastervolume.h \
- src/homescreenhandler.h \
- src/shell.h \
- src/aglsocketwrapper.h \
- src/chromecontroller.h \
- src/constants.h
+ src/homescreenhandler.h
OTHER_FILES += \
README.md
OTHER_FILES += \
README.md
@@
-58,9
+49,13
@@
RESOURCES += \
qml/images/Shortcut/shortcut.qrc \
qml/images/Status/status.qrc \
qml/images/images.qrc \
qml/images/Shortcut/shortcut.qrc \
qml/images/Status/status.qrc \
qml/images/images.qrc \
- qml/qml.qrc \
- qml/images/SpeechChrome/speechchrome.qrc
+ qml/qml.qrc
+
+AGL_SHELL_PATH = $$system(pkg-config --variable=pkgdatadir agl-compositor-0.0.20-protocols)
+WAYLANDCLIENTSOURCES += $$AGL_SHELL_PATH/agl-shell.xml $$AGL_SHELL_PATH/agl-shell-desktop.xml
+target.path = $${PREFIX}/usr/bin
+target.files += $${OUT_PWD}/$${TARGET}
+target.CONFIG = no_check_exist executable
-WAYLANDCLIENTSOURCES += \
- protocol/agl-shell.xml
+INSTALLS += target