diff options
author | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-12-09 12:14:02 +0100 |
---|---|---|
committer | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-12-09 12:14:02 +0100 |
commit | f2b8bddb94a451c4bd822ef723a8b739236f4b4f (patch) | |
tree | ed256a1c68b063b999b62cd0664c3dbdcb0fbc85 /HomeScreen/HomeScreen.pro | |
parent | b6d6fdc6384e686c8d866212b2f5d63ca884b3c5 (diff) |
Integrate Home app into HomeScreen
Home is located in ces2017 repo. But since it has to use
HomeScreen internal components (layermanager and applauncher),
I had to move it to main HomeScreen app.
Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
Diffstat (limited to 'HomeScreen/HomeScreen.pro')
-rw-r--r-- | HomeScreen/HomeScreen.pro | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/HomeScreen/HomeScreen.pro b/HomeScreen/HomeScreen.pro index 1ad42bf..d48b6e5 100644 --- a/HomeScreen/HomeScreen.pro +++ b/HomeScreen/HomeScreen.pro @@ -61,9 +61,13 @@ OTHER_FILES += \ HEADERS += \ src2/statusbarmodel.h \ src2/statusbarserver.h \ - src2/applicationlauncher.h + src2/applicationlauncher.h \ + src2/applicationmodel.h \ + src2/appinfo.h SOURCES += \ + src2/applicationmodel.cpp \ + src2/appinfo.cpp \ src2/statusbarmodel.cpp \ src2/statusbarserver.cpp \ src2/applicationlauncher.cpp @@ -72,6 +76,7 @@ RESOURCES += \ resources/homescreen.qrc RESOURCES += \ + qml/images/Home/home.qrc \ qml/images/MediaPlayer/mediaplayer.qrc \ qml/images/MediaMusic/mediamusic.qrc \ qml/images/Weather/weather.qrc \ @@ -79,10 +84,3 @@ RESOURCES += \ qml/images/Status/status.qrc \ qml/images/images.qrc \ qml/qml.qrc - - -copydata.commands = $(COPY_DIR) $$PWD/resources/colorschemes $$OUT_PWD -HomeScreen.depends = $(HomeScreen) copydata -export(HomeScreen.depends) -export(copydata.commands) -QMAKE_EXTRA_TARGETS += HomeScreen copydata |