diff options
| -rw-r--r-- | HomeScreen/HomeScreen.pro | 28 | ||||
| -rw-r--r-- | HomeScreen/src/appinfo.cpp (renamed from HomeScreen/src2/appinfo.cpp) | 0 | ||||
| -rw-r--r-- | HomeScreen/src/appinfo.h (renamed from HomeScreen/src2/appinfo.h) | 0 | ||||
| -rw-r--r-- | HomeScreen/src/applicationlauncher.cpp (renamed from HomeScreen/src2/applicationlauncher.cpp) | 0 | ||||
| -rw-r--r-- | HomeScreen/src/applicationlauncher.h (renamed from HomeScreen/src2/applicationlauncher.h) | 0 | ||||
| -rw-r--r-- | HomeScreen/src/applicationmodel.cpp (renamed from HomeScreen/src2/applicationmodel.cpp) | 0 | ||||
| -rw-r--r-- | HomeScreen/src/applicationmodel.h (renamed from HomeScreen/src2/applicationmodel.h) | 0 | ||||
| -rw-r--r-- | HomeScreen/src/main.cpp | 6 | ||||
| -rw-r--r-- | HomeScreen/src/statusbarmodel.cpp (renamed from HomeScreen/src2/statusbarmodel.cpp) | 0 | ||||
| -rw-r--r-- | HomeScreen/src/statusbarmodel.h (renamed from HomeScreen/src2/statusbarmodel.h) | 0 | ||||
| -rw-r--r-- | HomeScreen/src/statusbarserver.cpp (renamed from HomeScreen/src2/statusbarserver.cpp) | 0 | ||||
| -rw-r--r-- | HomeScreen/src/statusbarserver.h (renamed from HomeScreen/src2/statusbarserver.h) | 0 |
12 files changed, 15 insertions, 19 deletions
diff --git a/HomeScreen/HomeScreen.pro b/HomeScreen/HomeScreen.pro index b2afdd3..783c17b 100644 --- a/HomeScreen/HomeScreen.pro +++ b/HomeScreen/HomeScreen.pro @@ -23,29 +23,25 @@ include(../ivi_layermanagement_api.pri) SOURCES += \ src/main.cpp \ src/homescreencontrolinterface.cpp \ - src/layouthandler.cpp + src/layouthandler.cpp \ + src/applicationmodel.cpp \ + src/appinfo.cpp \ + src/statusbarmodel.cpp \ + src/statusbarserver.cpp \ + src/applicationlauncher.cpp HEADERS += \ src/homescreencontrolinterface.h \ - src/layouthandler.h + src/layouthandler.h \ + src/statusbarmodel.h \ + src/statusbarserver.h \ + src/applicationlauncher.h \ + src/applicationmodel.h \ + src/appinfo.h OTHER_FILES += \ README.md -HEADERS += \ - src2/statusbarmodel.h \ - src2/statusbarserver.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 - RESOURCES += \ qml/images/Home/home.qrc \ qml/images/MediaPlayer/mediaplayer.qrc \ diff --git a/HomeScreen/src2/appinfo.cpp b/HomeScreen/src/appinfo.cpp index 6b61632..6b61632 100644 --- a/HomeScreen/src2/appinfo.cpp +++ b/HomeScreen/src/appinfo.cpp diff --git a/HomeScreen/src2/appinfo.h b/HomeScreen/src/appinfo.h index a800a80..a800a80 100644 --- a/HomeScreen/src2/appinfo.h +++ b/HomeScreen/src/appinfo.h diff --git a/HomeScreen/src2/applicationlauncher.cpp b/HomeScreen/src/applicationlauncher.cpp index 7011ebf..7011ebf 100644 --- a/HomeScreen/src2/applicationlauncher.cpp +++ b/HomeScreen/src/applicationlauncher.cpp diff --git a/HomeScreen/src2/applicationlauncher.h b/HomeScreen/src/applicationlauncher.h index 00fbbe8..00fbbe8 100644 --- a/HomeScreen/src2/applicationlauncher.h +++ b/HomeScreen/src/applicationlauncher.h diff --git a/HomeScreen/src2/applicationmodel.cpp b/HomeScreen/src/applicationmodel.cpp index 2a16ace..2a16ace 100644 --- a/HomeScreen/src2/applicationmodel.cpp +++ b/HomeScreen/src/applicationmodel.cpp diff --git a/HomeScreen/src2/applicationmodel.h b/HomeScreen/src/applicationmodel.h index bffc4c9..bffc4c9 100644 --- a/HomeScreen/src2/applicationmodel.h +++ b/HomeScreen/src/applicationmodel.h diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp index ef7a015..a4235de 100644 --- a/HomeScreen/src/main.cpp +++ b/HomeScreen/src/main.cpp @@ -23,9 +23,9 @@ #include "layouthandler.h" #include "homescreencontrolinterface.h" -#include "../src2/applicationlauncher.h" -#include "../src2/statusbarmodel.h" -#include "../src2/applicationmodel.h" +#include "applicationlauncher.h" +#include "statusbarmodel.h" +#include "applicationmodel.h" void noOutput(QtMsgType, const QMessageLogContext &, const QString &) { diff --git a/HomeScreen/src2/statusbarmodel.cpp b/HomeScreen/src/statusbarmodel.cpp index 5438e89..5438e89 100644 --- a/HomeScreen/src2/statusbarmodel.cpp +++ b/HomeScreen/src/statusbarmodel.cpp diff --git a/HomeScreen/src2/statusbarmodel.h b/HomeScreen/src/statusbarmodel.h index 8d6a70b..8d6a70b 100644 --- a/HomeScreen/src2/statusbarmodel.h +++ b/HomeScreen/src/statusbarmodel.h diff --git a/HomeScreen/src2/statusbarserver.cpp b/HomeScreen/src/statusbarserver.cpp index bf6489d..bf6489d 100644 --- a/HomeScreen/src2/statusbarserver.cpp +++ b/HomeScreen/src/statusbarserver.cpp diff --git a/HomeScreen/src2/statusbarserver.h b/HomeScreen/src/statusbarserver.h index a5b89e5..a5b89e5 100644 --- a/HomeScreen/src2/statusbarserver.h +++ b/HomeScreen/src/statusbarserver.h |