git.iko.soy/unity8
on xenial help sign in
moved IndicatorsClient to modules. Fixed debian/control&install for indicators-client
bd55217Nick Dedekind
CMakeLists.txt+1
compare with xenial
unifiedsplit
@@ -131,6 +131,7 @@ install(FILES ${QML_JS_FILES}
131 )
131 )
132
132
133# add subdirectories to build
133# add subdirectories to build
134+add_subdirectory(modules)
134add_subdirectory(plugins)
135add_subdirectory(plugins)
135add_subdirectory(Panel)
136add_subdirectory(Panel)
136
137
Panel/Indicators/client/indicatorsclient.cpp+9−1
@@ -26,6 +26,14 @@
26#include <QQmlEngine>
26#include <QQmlEngine>
27#include <QDebug>
27#include <QDebug>
28
28
29+void prependImportPaths(QQmlEngine *engine, const QStringList &paths)
30+{
31+ QStringList importPathList = engine->importPathList();
32+ for (int i = paths.count()-1; i >= 0; i--)
33+ importPathList.prepend(paths[i]);
34+ engine->setImportPathList(importPathList);
35+}
36+
29IndicatorsClient::IndicatorsClient(int &argc, char **argv)
37IndicatorsClient::IndicatorsClient(int &argc, char **argv)
30 : QObject(0),
38 : QObject(0),
31 m_view(0)
39 m_view(0)
@@ -46,7 +54,7 @@ void IndicatorsClient::setupUI()
46{
54{
47 m_view = new QQuickView;
55 m_view = new QQuickView;
48 m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()+"Panel/Indicators/client/"));
56 m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()+"Panel/Indicators/client/"));
49− m_view->engine()->addImportPath(::shellImportPath());
57+ prependImportPaths(m_view->engine(), ::shellImportPaths());
50
58
51 m_view->setSource(QUrl("IndicatorsClient.qml"));
59 m_view->setSource(QUrl("IndicatorsClient.qml"));
52 m_view->setResizeMode(QQuickView::SizeRootObjectToView);
60 m_view->setResizeMode(QQuickView::SizeRootObjectToView);
debian/control+13−1
@@ -56,6 +56,17 @@ Architecture: all
56Description: transitional dummy package
56Description: transitional dummy package
57 This is a transitional dummy package. It can safely be removed.
57 This is a transitional dummy package. It can safely be removed.
58
58
59+Package: indicators-client
60+Architecture: amd64 armhf i386
61+Depends: ${shlibs:Depends},
62+ ${misc:Depends},
63+ qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
64+ qmenumodel-qml,
65+ unity8 (= ${source:Version}),
66+Description: Indicators and system settings client application
67+ This package contains the client application for indicators and system
68+ settings.
69+
59Package: unity8-fake-env
70Package: unity8-fake-env
60Replaces: qml-phone-shell-fake-env (<< 7.80~)
71Replaces: qml-phone-shell-fake-env (<< 7.80~)
61Breaks: qml-phone-shell-fake-env (<< 7.80~)
72Breaks: qml-phone-shell-fake-env (<< 7.80~)
@@ -75,7 +86,8 @@ Package: unity8-autopilot
75Replaces: qml-phone-shell-autopilot (<< 7.80~)
86Replaces: qml-phone-shell-autopilot (<< 7.80~)
76Breaks: qml-phone-shell-autopilot (<< 7.80~)
87Breaks: qml-phone-shell-autopilot (<< 7.80~)
77Architecture: all
88Architecture: all
89+Depends: indicators-client (= ${source:Version}),
78−Depends: libautopilot-qt,
90+ libautopilot-qt,
79 libqt5test5,
91 libqt5test5,
80 libqt5widgets5,
92 libqt5widgets5,
81 python-evdev,
93 python-evdev,
debian/indicators-client.installnew file+1
@@ -0,0 +1 @@
1+/usr/bin/indicators-client
debian/unity8.install+1
@@ -13,6 +13,7 @@
13/usr/share/unity8/Shell.qml
13/usr/share/unity8/Shell.qml
14/usr/share/unity8/SideStage/*
14/usr/share/unity8/SideStage/*
15/usr/share/unity8/graphics/*
15/usr/share/unity8/graphics/*
16+/usr/share/unity8/modules/IndicatorsClient/*
16/usr/share/unity8/plugins/HudClient/*
17/usr/share/unity8/plugins/HudClient/*
17/usr/share/unity8/plugins/LightDM/*
18/usr/share/unity8/plugins/LightDM/*
18/usr/share/unity8/plugins/Ubuntu/*
19/usr/share/unity8/plugins/Ubuntu/*
main.cpp+14−5
@@ -32,13 +32,22 @@
32#include "paths.h"
32#include "paths.h"
33
33
34namespace {
34namespace {
35+
36+void prependImportPaths(QQmlEngine *engine, const QStringList &paths)
37+{
38+ QStringList importPathList = engine->importPathList();
39+ for (int i = paths.count() -1; i >= 0; i--)
40+ importPathList.prepend(paths[i]);
41+ engine->setImportPathList(importPathList);
42+}
43+
35/* When you append and import path to the list of import paths it will be the *last*
44/* When you append and import path to the list of import paths it will be the *last*
36 place where Qt will search for QML modules.
45 place where Qt will search for QML modules.
37 The usual QQmlEngine::addImportPath() actually prepends the given path.*/
46 The usual QQmlEngine::addImportPath() actually prepends the given path.*/
38−void appendImportPath(QQmlEngine *engine, const QString &path)
47+void appendImportPaths(QQmlEngine *engine, const QStringList &paths)
39{
48{
40 QStringList importPathList = engine->importPathList();
49 QStringList importPathList = engine->importPathList();
41− importPathList.append(path);
50+ importPathList.append(paths);
42 engine->setImportPathList(importPathList);
51 engine->setImportPathList(importPathList);
43}
52}
44
53
@@ -113,9 +122,9 @@ int main(int argc, char** argv)
113 view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
122 view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
114
123
115 QUrl source("Shell.qml");
124 QUrl source("Shell.qml");
116− view->engine()->addImportPath(::shellAppDirectory());
125+ prependImportPaths(view->engine(), QStringList() << ::shellAppDirectory());
117− view->engine()->addImportPath(::shellImportPath());
126+ prependImportPaths(view->engine(), ::shellImportPaths());
118− appendImportPath(view->engine(), ::fakePluginsImportPath());
127+ appendImportPaths(view->engine(), QStringList() << ::fakePluginsImportPath());
119 view->setSource(source);
128 view->setSource(source);
120 view->setColor("transparent");
129 view->setColor("transparent");
121
130
modules/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(IndicatorsClient)
plugins/IndicatorsClient/CMakeLists.txt → modules/IndicatorsClient/CMakeLists.txtrenamed

The content is the same.

plugins/IndicatorsClient/Network/CMakeLists.txt → modules/IndicatorsClient/Network/CMakeLists.txtrenamed

The content is the same.

plugins/IndicatorsClient/Network/networkagent.cpp → modules/IndicatorsClient/Network/networkagent.cpprenamed

The content is the same.

plugins/IndicatorsClient/Network/networkagent.h → modules/IndicatorsClient/Network/networkagent.hrenamed

The content is the same.

plugins/IndicatorsClient/Network/plugin.cpp → modules/IndicatorsClient/Network/plugin.cpprenamed

The content is the same.

plugins/IndicatorsClient/Network/plugin.h → modules/IndicatorsClient/Network/plugin.hrenamed

The content is the same.

plugins/IndicatorsClient/Network/secret-agent.c → modules/IndicatorsClient/Network/secret-agent.crenamed

The content is the same.

plugins/IndicatorsClient/Network/secret-agent.h → modules/IndicatorsClient/Network/secret-agent.hrenamed

The content is the same.

plugins/IndicatorsClient/flatmenuproxymodel.cpp → modules/IndicatorsClient/flatmenuproxymodel.cpprenamed

The content is the same.

plugins/IndicatorsClient/flatmenuproxymodel.h → modules/IndicatorsClient/flatmenuproxymodel.hrenamed

The content is the same.

plugins/IndicatorsClient/indicator.cpp → modules/IndicatorsClient/indicator.cpprenamed

The content is the same.

plugins/IndicatorsClient/indicator.h → modules/IndicatorsClient/indicator.hrenamed

The content is the same.

plugins/IndicatorsClient/indicatorsmanager.cpp → modules/IndicatorsClient/indicatorsmanager.cpprenamed

The content is the same.

plugins/IndicatorsClient/indicatorsmanager.h → modules/IndicatorsClient/indicatorsmanager.hrenamed

The content is the same.

plugins/IndicatorsClient/indicatorsmodel.cpp → modules/IndicatorsClient/indicatorsmodel.cpprenamed

The content is the same.

plugins/IndicatorsClient/indicatorsmodel.h → modules/IndicatorsClient/indicatorsmodel.hrenamed

The content is the same.

plugins/IndicatorsClient/plugin.cpp → modules/IndicatorsClient/plugin.cpprenamed

The content is the same.

plugins/IndicatorsClient/plugin.h → modules/IndicatorsClient/plugin.hrenamed

The content is the same.

plugins/IndicatorsClient/qml/BasicMenu.qml → modules/IndicatorsClient/qml/BasicMenu.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/ButtonMenu.qml → modules/IndicatorsClient/qml/ButtonMenu.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/CMakeLists.txt → modules/IndicatorsClient/qml/CMakeLists.txtrenamed+4−4
@@ -4,20 +4,20 @@ file(GLOB IndicatorsClient_QMLFILES
4
4
5# copy qmldir file into build directory for shadow builds
5# copy qmldir file into build directory for shadow builds
6file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
6file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient
7+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient
8)
8)
9
9
10# copy qmldir file into build directory for shadow builds
10# copy qmldir file into build directory for shadow builds
11file(COPY ${IndicatorsClient_QMLFILES}
11file(COPY ${IndicatorsClient_QMLFILES}
12− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient
12+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient
13)
13)
14
14
15install(FILES qmldir
15install(FILES qmldir
16− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient
16+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient
17)
17)
18
18
19install(FILES ${IndicatorsClient_QMLFILES}
19install(FILES ${IndicatorsClient_QMLFILES}
20− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Network
20+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Network
21)
21)
22
22
23add_subdirectory(messaging)
23add_subdirectory(messaging)
plugins/IndicatorsClient/qml/DBusActionState.qml → modules/IndicatorsClient/qml/DBusActionState.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/DivMenu.qml → modules/IndicatorsClient/qml/DivMenu.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/HLine.qml → modules/IndicatorsClient/qml/HLine.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/IndicatorBase.qml → modules/IndicatorsClient/qml/IndicatorBase.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/IndicatorIcon.qml → modules/IndicatorsClient/qml/IndicatorIcon.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/IndicatorPage.qml → modules/IndicatorsClient/qml/IndicatorPage.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/Menu.qml → modules/IndicatorsClient/qml/Menu.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/MenuFactory.qml → modules/IndicatorsClient/qml/MenuFactory.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/ProgressMenu.qml → modules/IndicatorsClient/qml/ProgressMenu.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/RemoveBackground.qml → modules/IndicatorsClient/qml/RemoveBackground.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/SectionMenu.qml → modules/IndicatorsClient/qml/SectionMenu.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/SliderMenu.qml → modules/IndicatorsClient/qml/SliderMenu.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/SwitchMenu.qml → modules/IndicatorsClient/qml/SwitchMenu.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/TextMenu.qml → modules/IndicatorsClient/qml/TextMenu.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/ActionButton.qml → modules/IndicatorsClient/qml/messaging/ActionButton.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/ActionTextField.qml → modules/IndicatorsClient/qml/messaging/ActionTextField.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/CMakeLists.txt → modules/IndicatorsClient/qml/messaging/CMakeLists.txtrenamed+4−4
@@ -5,18 +5,18 @@ file(GLOB IndicatorsClient_QMLFILES
5
5
6# copy qmldir file into build directory for shadow builds
6# copy qmldir file into build directory for shadow builds
7file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
8− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient/Messaging
8+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Messaging
9)
9)
10
10
11# copy qmldir file into build directory for shadow builds
11# copy qmldir file into build directory for shadow builds
12file(COPY ${IndicatorsClient_QMLFILES}
12file(COPY ${IndicatorsClient_QMLFILES}
13− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient/Messaging
13+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Messaging
14)
14)
15
15
16install(FILES qmldir
16install(FILES qmldir
17− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Messaging
17+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Messaging
18)
18)
19
19
20install(FILES ${IndicatorsClient_QMLFILES}
20install(FILES ${IndicatorsClient_QMLFILES}
21− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Messaging
21+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Messaging
22)
22)
plugins/IndicatorsClient/qml/messaging/GroupedMessage.qml → modules/IndicatorsClient/qml/messaging/GroupedMessage.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/HeroMessage.qml → modules/IndicatorsClient/qml/messaging/HeroMessage.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/HeroMessageHeader.qml → modules/IndicatorsClient/qml/messaging/HeroMessageHeader.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/MessageItem.qml → modules/IndicatorsClient/qml/messaging/MessageItem.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/QuickReply.qml → modules/IndicatorsClient/qml/messaging/QuickReply.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/SimpleTextMessage.qml → modules/IndicatorsClient/qml/messaging/SimpleTextMessage.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/SnapDecision.qml → modules/IndicatorsClient/qml/messaging/SnapDecision.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/TextMessage.qml → modules/IndicatorsClient/qml/messaging/TextMessage.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/qmldir → modules/IndicatorsClient/qml/messaging/qmldirrenamed

The content is the same.

plugins/IndicatorsClient/qml/messaging/utils.js → modules/IndicatorsClient/qml/messaging/utils.jsrenamed

The content is the same.

plugins/IndicatorsClient/qml/network/AccessPoint.qml → modules/IndicatorsClient/qml/network/AccessPoint.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/network/CMakeLists.txt → modules/IndicatorsClient/qml/network/CMakeLists.txtrenamed+4−4
@@ -4,18 +4,18 @@ file(GLOB IndicatorsClient_QMLFILES
4
4
5# copy qmldir file into build directory for shadow builds
5# copy qmldir file into build directory for shadow builds
6file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
6file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient/Network
7+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Network
8)
8)
9
9
10# copy qmldir file into build directory for shadow builds
10# copy qmldir file into build directory for shadow builds
11file(COPY ${IndicatorsClient_QMLFILES}
11file(COPY ${IndicatorsClient_QMLFILES}
12− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient/Network
12+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Network
13)
13)
14
14
15install(FILES qmldir
15install(FILES qmldir
16− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Network
16+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Network
17)
17)
18
18
19install(FILES ${IndicatorsClient_QMLFILES}
19install(FILES ${IndicatorsClient_QMLFILES}
20− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Network
20+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Network
21)
21)
plugins/IndicatorsClient/qml/network/PasswordPage.qml → modules/IndicatorsClient/qml/network/PasswordPage.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/network/WifiSection.qml → modules/IndicatorsClient/qml/network/WifiSection.qmlrenamed

The content is the same.

plugins/IndicatorsClient/qml/network/qmldir → modules/IndicatorsClient/qml/network/qmldirrenamed

The content is the same.

plugins/IndicatorsClient/qml/qmldir → modules/IndicatorsClient/qml/qmldirrenamed

The content is the same.

plugins/IndicatorsClient/resources/artwork/datetime/time_and_date@18.png → modules/IndicatorsClient/resources/artwork/datetime/time_and_date@18.pngrenamed

Binary file not shown.

plugins/IndicatorsClient/resources/artwork/messaging/default_app.svg → modules/IndicatorsClient/resources/artwork/messaging/default_app.svgrenamed

The content is the same.

plugins/IndicatorsClient/resources/artwork/messaging/default_contact.png → modules/IndicatorsClient/resources/artwork/messaging/default_contact.pngrenamed

Binary file not shown.

plugins/IndicatorsClient/resources/artwork/messaging/message_sms01_54px.png → modules/IndicatorsClient/resources/artwork/messaging/message_sms01_54px.pngrenamed

Binary file not shown.

plugins/IndicatorsClient/resources/indicatorclient.qrc → modules/IndicatorsClient/resources/indicatorclient.qrcrenamed

The content is the same.

paths.h.in+7−3
@@ -47,12 +47,16 @@ inline QString shellAppDirectory() {
47 }
47 }
48}
48}
49
49
50−inline QString shellImportPath() {
50+inline QStringList shellImportPaths() {
51+ QStringList paths;
51 if (isRunningInstalled()) {
52 if (isRunningInstalled()) {
52− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
53+ paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
54+ paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/modules");
53 } else {
55 } else {
54− return QString("@CMAKE_BINARY_DIR@/plugins/");
56+ paths << QString("@CMAKE_BINARY_DIR@/plugins");
57+ paths << QString("@CMAKE_BINARY_DIR@/modules");
55 }
58 }
59+ return paths;
56}
60}
57
61
58inline QString fakePluginsImportPath() {
62inline QString fakePluginsImportPath() {
plugins/CMakeLists.txt−1
@@ -2,5 +2,4 @@ add_subdirectory(Ubuntu)
2add_subdirectory(Utils)
2add_subdirectory(Utils)
3add_subdirectory(Unity)
3add_subdirectory(Unity)
4add_subdirectory(HudClient)
4add_subdirectory(HudClient)
5−add_subdirectory(IndicatorsClient)
6add_subdirectory(LightDM)
5add_subdirectory(LightDM)
plugins/Utils/applicationpaths.h+1−1
@@ -31,7 +31,7 @@ public:
31
31
32 Q_INVOKABLE bool isRunningInstalled() const { return ::isRunningInstalled(); }
32 Q_INVOKABLE bool isRunningInstalled() const { return ::isRunningInstalled(); }
33 Q_INVOKABLE QString shellAppDirectory() const { return ::shellAppDirectory(); }
33 Q_INVOKABLE QString shellAppDirectory() const { return ::shellAppDirectory(); }
34− Q_INVOKABLE QString shellImportPath() const { return ::shellImportPath(); }
34+ Q_INVOKABLE QStringList shellImportPaths() const { return ::shellImportPaths(); }
35 Q_INVOKABLE QString fakePluginsImportPath() const { return ::fakePluginsImportPath(); }
35 Q_INVOKABLE QString fakePluginsImportPath() const { return ::fakePluginsImportPath(); }
36 Q_INVOKABLE QStringList shellDataDirs() const { return ::shellDataDirs(); }
36 Q_INVOKABLE QStringList shellDataDirs() const { return ::shellDataDirs(); }
37 Q_INVOKABLE QString sourceDirectory() const { return ::sourceDirectory(); }
37 Q_INVOKABLE QString sourceDirectory() const { return ::sourceDirectory(); }
run+1−1
@@ -35,7 +35,7 @@ do
35done
35done
36
36
37if $FAKE; then
37if $FAKE; then
38− export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins
38+ export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
39 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single
39 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single
40fi
40fi
41
41
tests/CMakeLists.txt+1
@@ -11,4 +11,5 @@ add_subdirectory(qmltests)
11add_subdirectory(mocks)
11add_subdirectory(mocks)
12add_subdirectory(whitespace)
12add_subdirectory(whitespace)
13add_subdirectory(plugins)
13add_subdirectory(plugins)
14+add_subdirectory(modules)
14add_subdirectory(utils)
15add_subdirectory(utils)
tests/modules/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(IndicatorsClient)
tests/plugins/IndicatorsClient/CMakeLists.txt → tests/modules/IndicatorsClient/CMakeLists.txtrenamed+2−2
@@ -1,7 +1,7 @@
1include_directories(
1include_directories(
2 ${CMAKE_CURRENT_BINARY_DIR}
2 ${CMAKE_CURRENT_BINARY_DIR}
3− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/IndicatorsClient
3+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules/IndicatorsClient
4− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/IndicatorsClient/indicators/common
4+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules/IndicatorsClient/indicators/common
5 )
5 )
6
6
7macro(run_tests)
7macro(run_tests)
tests/plugins/IndicatorsClient/indicatorsmanagertest.cpp → tests/modules/IndicatorsClient/indicatorsmanagertest.cpprenamed

The content is the same.

tests/plugins/IndicatorsClient/indicatorsmodeltest.cpp → tests/modules/IndicatorsClient/indicatorsmodeltest.cpprenamed

The content is the same.

tests/plugins/CMakeLists.txt−1
@@ -1,3 +1,2 @@
1−add_subdirectory(IndicatorsClient)
2add_subdirectory(Utils)
1add_subdirectory(Utils)
3add_subdirectory(Ubuntu)
2add_subdirectory(Ubuntu)
tests/qmltests/CMakeLists.txt+1
@@ -5,6 +5,7 @@ add_subdirectory(plugins)
5
5
6set(qmltest_DEFAULT_IMPORT_PATHS
6set(qmltest_DEFAULT_IMPORT_PATHS
7 ${CMAKE_CURRENT_BINARY_DIR}/plugins
7 ${CMAKE_CURRENT_BINARY_DIR}/plugins
8+ ${CMAKE_CURRENT_BINARY_DIR}/modules
8 ${CMAKE_BINARY_DIR}/tests/utils/modules
9 ${CMAKE_BINARY_DIR}/tests/utils/modules
9)
10)
10
11