diff options
author | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-07-06 19:35:45 +0200 |
---|---|---|
committer | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-07-06 19:35:45 +0200 |
commit | 3478f65b39560b333ba189e7d86e2c2cebfc9c7a (patch) | |
tree | 5a2432297d5a1879f3581e89940dbd8fe016cdc9 /HomeScreenSimulator | |
parent | 2513c5c6ed1c89ae3a0a6ae0263b9307d50046b2 (diff) |
Support for color schemesv0.1.1
- 3 demo color schemes included
Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
Diffstat (limited to 'HomeScreenSimulator')
-rw-r--r-- | HomeScreenSimulator/HomeScreenSimulator.pro | 94 | ||||
-rw-r--r-- | HomeScreenSimulator/README.md | 10 | ||||
-rw-r--r-- | HomeScreenSimulator/src/main.cpp | 2 |
3 files changed, 23 insertions, 83 deletions
diff --git a/HomeScreenSimulator/HomeScreenSimulator.pro b/HomeScreenSimulator/HomeScreenSimulator.pro index ae57a86..04aff3c 100644 --- a/HomeScreenSimulator/HomeScreenSimulator.pro +++ b/HomeScreenSimulator/HomeScreenSimulator.pro @@ -23,101 +23,31 @@ TEMPLATE = app SOURCES += \ src/main.cpp \ src/mainwindow.cpp -GENERATED_SOURCES += \ - $$OUT_PWD/daynightmode_adapter.cpp \ #generated dbus adapter - $$OUT_PWD/daynightmode_proxy.cpp \ #generated dbus proxy - $$OUT_PWD/popup_adapter.cpp \ #generated dbus adapter - $$OUT_PWD/popup_proxy.cpp \ #generated dbus proxy - $$OUT_PWD/statusbar_adapter.cpp \ #generated dbus adapter - $$OUT_PWD/statusbar_proxy.cpp #generated dbus proxy HEADERS += \ ../interfaces/daynightmode.h \ ../interfaces/popup.h \ src/mainwindow.h \ - $$OUT_PWD/daynightmode_adapter.h \ #generated dbus adapter - $$OUT_PWD/daynightmode_proxy.h \ #generated dbus proxy - $$OUT_PWD/popup_adapter.h \ #generated dbus adapter - $$OUT_PWD/popup_proxy.h \ #generated dbus proxy - $$OUT_PWD/statusbar_adapter.h \ #generated dbus adapter - $$OUT_PWD/statusbar_proxy.h #generated dbus proxy + $$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 FORMS += \ resources/mainwindow.ui OTHER_FILES += \ - interfaces/daynightmode.xml \ - interfaces/popup.xml \ - interfaces/statusbar.xml \ README.md RESOURCES += # remove generated files QMAKE_CLEAN += -r \ - $$OUT_PWD/HomeScreen \ - $$OUT_PWD/Makefile \ - $$OUT_PWD/daynightmode_adapter.h \ - $$OUT_PWD/daynightmode_adapter.cpp \ - $$OUT_PWD/daynightmode_adapter.moc \ - $$OUT_PWD/daynightmode_proxy.h \ - $$OUT_PWD/daynightmode_proxy.cpp \ - $$OUT_PWD/daynightmode_proxy.moc \ - $$OUT_PWD/popup_adapter.h \ - $$OUT_PWD/popup_adapter.cpp \ - $$OUT_PWD/popup_adapter.moc \ - $$OUT_PWD/popup_proxy.h \ - $$OUT_PWD/popup_proxy.cpp \ - $$OUT_PWD/popup_proxy.moc \ - $$OUT_PWD/inputevent_adapter.h \ - $$OUT_PWD/inputevent_adapter.cpp \ - $$OUT_PWD/inputevent_adapter.moc \ - $$OUT_PWD/inputevent_proxy.h \ - $$OUT_PWD/inputevent_proxy.cpp \ - $$OUT_PWD/inputevent_proxy.moc \ - $$OUT_PWD/statusbar_adapter.h \ - $$OUT_PWD/statusbar_adapter.cpp \ - $$OUT_PWD/statusbar_adapter.moc \ - $$OUT_PWD/statusbar_proxy.h \ - $$OUT_PWD/statusbar_proxy.cpp \ - $$OUT_PWD/statusbar_proxy.moc - -# Create custom targets for generating dbus proxy and adapter -# OE_QMAKE_PATH_EXTERNAL_HOST_BINS is only defined in the yocto environment -isEmpty(OE_QMAKE_PATH_EXTERNAL_HOST_BINS){ - OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "/" -} -# for daynightmode -daynightmodegenerateadapter.target = $$OUT_PWD/daynightmode_adapter.cpp -unix:daynightmodegenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a daynightmode_adapter $$_PRO_FILE_PWD_/../interfaces/daynightmode.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/daynightmode_adapter.h -o $$OUT_PWD/daynightmode_adapter.moc" -daynightmodegenerateproxy.target = $$OUT_PWD/daynightmode_proxy.cpp -unix:daynightmodegenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p daynightmode_proxy $$_PRO_FILE_PWD_/../interfaces/daynightmode.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/daynightmode_proxy.h -o $$OUT_PWD/daynightmode_proxy.moc" -PRE_TARGETDEPS += \ - $$OUT_PWD/daynightmode_adapter.cpp \ - $$OUT_PWD/daynightmode_proxy.cpp -QMAKE_EXTRA_TARGETS += \ - daynightmodegenerateadapter \ - daynightmodegenerateproxy -# for popup -popupgenerateadapter.target = $$OUT_PWD/popup_adapter.cpp -unix:popupgenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a popup_adapter $$_PRO_FILE_PWD_/../interfaces/popup.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/popup_adapter.h -o $$OUT_PWD/popup_adapter.moc" -popupgenerateproxy.target = $$OUT_PWD/popup_proxy.cpp -unix:popupgenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p popup_proxy $$_PRO_FILE_PWD_/../interfaces/popup.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/popup_proxy.h -o $$OUT_PWD/popup_proxy.moc" -PRE_TARGETDEPS += \ - $$OUT_PWD/popup_adapter.cpp \ - $$OUT_PWD/popup_proxy.cpp -QMAKE_EXTRA_TARGETS += \ - popupgenerateadapter \ - popupgenerateproxy -# for statusbar -statusbargenerateadapter.target = $$OUT_PWD/statusbar_adapter.cpp -unix:statusbargenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a statusbar_adapter $$_PRO_FILE_PWD_/../interfaces/statusbar.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/statusbar_adapter.h -o $$OUT_PWD/statusbar_adapter.moc" -statusbargenerateproxy.target = $$OUT_PWD/statusbar_proxy.cpp -unix:statusbargenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p statusbar_proxy $$_PRO_FILE_PWD_/../interfaces/statusbar.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/statusbar_proxy.h -o $$OUT_PWD/statusbar_proxy.moc" -PRE_TARGETDEPS += \ - $$OUT_PWD/statusbar_adapter.cpp \ - $$OUT_PWD/statusbar_proxy.cpp -QMAKE_EXTRA_TARGETS += \ - statusbargenerateadapter \ - statusbargenerateproxy - + $$OUT_PWD/HomeScreenSimulator \ + $$OUT_PWD/Makefile diff --git a/HomeScreenSimulator/README.md b/HomeScreenSimulator/README.md index 55152cd..30dbfe8 100644 --- a/HomeScreenSimulator/README.md +++ b/HomeScreenSimulator/README.md @@ -1,9 +1,19 @@ AGL Home Screen Simulator for development +Build with QtCreator 3.0.1 + AGL repo for source code: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen +AGL repo for bitbake recipe: +https://gerrit.automotivelinux.org/gerrit/#/admin/projects/AGL/meta-agl-demo/recipes-demo-hmi/HomeScreen/HomeScreen_?.bb + +v0.1.1 +07/06/2015 + +#changes +- D-Bus interface calsses now linkes as static lib v0.1.0 06/24/2016 diff --git a/HomeScreenSimulator/src/main.cpp b/HomeScreenSimulator/src/main.cpp index 9c5a108..921c4eb 100644 --- a/HomeScreenSimulator/src/main.cpp +++ b/HomeScreenSimulator/src/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationDomain("LinuxFoundation"); QCoreApplication::setOrganizationName("AutomotiveGradeLinux"); QCoreApplication::setApplicationName("HomeScreenSimulator"); - QCoreApplication::setApplicationVersion("0.1.0"); + QCoreApplication::setApplicationVersion("0.1.1"); MainWindow w; w.show(); |