Code Review
/
staging
/
HomeScreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
First integration of new HMI design
[staging/HomeScreen.git]
/
HomeScreen
/
HomeScreen.pro
diff --git
a/HomeScreen/HomeScreen.pro
b/HomeScreen/HomeScreen.pro
index
e73539e
..
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.
# 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
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 \
SOURCES += \
src/main.cpp \
@@
-26,30
+27,20
@@
SOURCES += \
src/popupwidget.cpp \
src/controlbarwidget.cpp \
src/statusbarwidget.cpp \
src/popupwidget.cpp \
src/controlbarwidget.cpp \
src/statusbarwidget.cpp \
- src/applauncher
widget
.cpp \
+ src/applauncher.cpp \
src/homescreencontrolinterface.cpp \
src/layouthandler.cpp
HEADERS += \
src/homescreencontrolinterface.cpp \
src/layouthandler.cpp
HEADERS += \
- ../interfaces/appframework.h \
- ../interfaces/daynightmode.h \
- ../interfaces/popup.h \
- ../interfaces/statusbar.h \
src/mainwindow.h \
src/settingswidget.h \
src/popupwidget.h \
src/controlbarwidget.h \
src/statusbarwidget.h \
src/mainwindow.h \
src/settingswidget.h \
src/popupwidget.h \
src/controlbarwidget.h \
src/statusbarwidget.h \
- src/applauncher
widget
.h \
+ src/applauncher.h \
src/homescreencontrolinterface.h \
src/layouthandler.h
src/homescreencontrolinterface.h \
src/layouthandler.h
-INCLUDEPATH += $$OUT_PWD/../interfaces
-INCLUDEPATH += ../interfaces/
-
-LIBS += -L$$OUT_PWD/../interfaces -linterfaces
-
-
FORMS += \
resources/mainwindow.ui \
resources/settingswidget.ui \
FORMS += \
resources/mainwindow.ui \
resources/settingswidget.ui \
@@
-66,17
+57,32
@@
TRANSLATIONS = \
OTHER_FILES += \
README.md
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 += \
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
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