X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2FHomeScreen.pro;h=1ad42bf3a30f71c1dbb223073cafcc40b8d5840f;hb=79714c0aa8fc461d77b75d6c5dae6a1a7d726954;hp=bfe049188d45f97685922d374f265ca28f07a653;hpb=3478f65b39560b333ba189e7d86e2c2cebfc9c7a;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/HomeScreen.pro b/HomeScreen/HomeScreen.pro
index bfe0491..1ad42bf 100644
--- a/HomeScreen/HomeScreen.pro
+++ b/HomeScreen/HomeScreen.pro
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-QT       += core gui dbus
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = HomeScreen
 TEMPLATE = app
+TARGET = HomeScreen
+QT = qml quick widgets dbus
+CONFIG += c++11
 
+include(../interfaces/interfaces.pri)
+include(../ivi_layermanagement_api.pri)
 
 SOURCES += \
     src/main.cpp \
@@ -26,34 +26,28 @@ SOURCES += \
     src/settingswidget.cpp \
     src/popupwidget.cpp \
     src/controlbarwidget.cpp \
-    src/statusbarwidget.cpp
+    src/statusbarwidget.cpp \
+    src/applauncher.cpp \
+    src/homescreencontrolinterface.cpp \
+    src/layouthandler.cpp
 
 HEADERS  += \
-    ../interfaces/daynightmode.h \
-    ../interfaces/popup.h \
     src/mainwindow.h \
     src/settingswidget.h \
     src/popupwidget.h \
     src/controlbarwidget.h \
     src/statusbarwidget.h \
-    $$OUT_PWD/../interfaces/daynightmode_adapter.h \      #generated dbus adapter
-    $$OUT_PWD/../interfaces/daynightmode_proxy.h \        #generated dbus proxy
-    $$OUT_PWD/../interfaces/popup_adapter.h \             #generated dbus adapter
-    $$OUT_PWD/../interfaces/popup_proxy.h \               #generated dbus proxy
-    $$OUT_PWD/../interfaces/statusbar_adapter.h \         #generated dbus adapter
-    $$OUT_PWD/../interfaces/statusbar_proxy.h             #generated dbus proxy
-
-INCLUDEPATH += $$OUT_PWD/../interfaces
-
-LIBS += -L$$OUT_PWD/../interfaces -linterfaces
-
+    src/applauncher.h \
+    src/homescreencontrolinterface.h \
+    src/layouthandler.h
 
 FORMS    += \
     resources/mainwindow.ui \
     resources/settingswidget.ui \
     resources/popupwidget.ui \
     resources/controlbarwidget.ui \
-    resources/statusbarwidget.ui
+    resources/statusbarwidget.ui \
+    resources/applauncherwidget.ui
 
 TRANSLATIONS = \
     resources/translations/homescreen_en_US.ts \
@@ -63,16 +57,32 @@ TRANSLATIONS = \
 OTHER_FILES += \
     README.md
 
+
+HEADERS += \
+    src2/statusbarmodel.h \
+    src2/statusbarserver.h \
+    src2/applicationlauncher.h
+
+SOURCES += \
+    src2/statusbarmodel.cpp \
+    src2/statusbarserver.cpp \
+    src2/applicationlauncher.cpp
+
 RESOURCES += \
     resources/homescreen.qrc
 
+RESOURCES += \
+    qml/images/MediaPlayer/mediaplayer.qrc \
+    qml/images/MediaMusic/mediamusic.qrc \
+    qml/images/Weather/weather.qrc \
+    qml/images/Shortcut/shortcut.qrc \
+    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
-
-# remove generated files
-QMAKE_CLEAN += -r \
-    $$OUT_PWD/HomeScreen \
-    $$OUT_PWD/Makefile