First integration of new HMI design

[staging/HomeScreen.git] / HomeScreen / HomeScreen.pro

diff --git a/HomeScreen/HomeScreen.pro b/HomeScreen/HomeScreen.pro
index 7c66fda..1ad42bf 100644 (file)
--- a/HomeScreen/HomeScreen.pro
+++ b/HomeScreen/HomeScreen.pro
@@ -12,12 +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,7 +27,7 @@ SOURCES += \
     src/popupwidget.cpp \
     src/controlbarwidget.cpp \
     src/statusbarwidget.cpp \
-    src/applauncherwidget.cpp \
+    src/applauncher.cpp \
     src/homescreencontrolinterface.cpp \
     src/layouthandler.cpp
 
@@ -36,12 +37,10 @@ HEADERS  += \
     src/popupwidget.h \
     src/controlbarwidget.h \
     src/statusbarwidget.h \
-    src/applauncherwidget.h \
+    src/applauncher.h \
     src/homescreencontrolinterface.h \
     src/layouthandler.h
 
-include(../interfaces/interfaces.pri)
-
 FORMS    += \
     resources/mainwindow.ui \
     resources/settingswidget.ui \
@@ -58,17 +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/colorschemes \
-    $$OUT_PWD/HomeScreen \
-    $$OUT_PWD/Makefile