git.iko.soy/unity8
on xenial help sign in
Rename Ubuntu.Connectivity to Unity.Connectivity to avoid name clash
5b1719cMichał Sawicz
plugins/Ubuntu/CMakeLists.txt−1
compare with xenial
unifiedsplit
@@ -1,4 +1,3 @@
1−add_subdirectory(Connectivity)
2add_subdirectory(Gestures)
1add_subdirectory(Gestures)
3add_subdirectory(DownloadDaemonListener)
2add_subdirectory(DownloadDaemonListener)
4add_subdirectory(Payments)
3add_subdirectory(Payments)
plugins/Unity/CMakeLists.txt+1
@@ -1,3 +1,4 @@
1+add_subdirectory(Connectivity)
1add_subdirectory(Indicators)
2add_subdirectory(Indicators)
2add_subdirectory(Launcher)
3add_subdirectory(Launcher)
3add_subdirectory(Session)
4add_subdirectory(Session)
plugins/Ubuntu/Connectivity/CMakeLists.txt → plugins/Unity/Connectivity/CMakeLists.txtrenamed+1−1
@@ -7,4 +7,4 @@ add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
7
7
8qt5_use_modules(Connectivity Qml DBus Core)
8qt5_use_modules(Connectivity Qml DBus Core)
9
9
10−add_unity8_plugin(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS Connectivity)
10+add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
plugins/Ubuntu/Connectivity/Connectivity.cpp → plugins/Unity/Connectivity/Connectivity.cpprenamed

The content is the same.

plugins/Ubuntu/Connectivity/Connectivity.h → plugins/Unity/Connectivity/Connectivity.hrenamed

The content is the same.

plugins/Ubuntu/Connectivity/Connectivity.qmltypes → plugins/Unity/Connectivity/Connectivity.qmltypesrenamed+4−2
@@ -4,13 +4,15 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'
7+// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 plugins'
8
8
9Module {
9Module {
10 Component {
10 Component {
11 name: "Connectivity"
11 name: "Connectivity"
12 prototype: "QObject"
12 prototype: "QObject"
13− exports: ["Ubuntu.Connectivity/Connectivity 0.1"]
13+ exports: ["Unity.Connectivity/Connectivity 0.1"]
14+ isCreatable: false
15+ isSingleton: true
14 exportMetaObjectRevisions: [0]
16 exportMetaObjectRevisions: [0]
15 Method { name: "unlockAllModems" }
17 Method { name: "unlockAllModems" }
16 }
18 }
plugins/Ubuntu/Connectivity/plugin.cpp → plugins/Unity/Connectivity/plugin.cpprenamed+1−1
@@ -28,7 +28,7 @@ static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
28
28
29void BackendPlugin::registerTypes(const char *uri)
29void BackendPlugin::registerTypes(const char *uri)
30{
30{
31− Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));
31+ Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
32
32
33 qmlRegisterSingletonType<Connectivity>(uri, 0, 1, "Connectivity", service_provider);
33 qmlRegisterSingletonType<Connectivity>(uri, 0, 1, "Connectivity", service_provider);
34}
34}
plugins/Ubuntu/Connectivity/plugin.h → plugins/Unity/Connectivity/plugin.hrenamed

The content is the same.

plugins/Ubuntu/Connectivity/qmldir → plugins/Unity/Connectivity/qmldirrenamed+1−1
@@ -1,3 +1,3 @@
1−module Ubuntu.Connectivity
1+module Unity.Connectivity
2plugin Connectivity
2plugin Connectivity
3typeinfo Connectivity.qmltypes
3typeinfo Connectivity.qmltypes
qml/Shell.qml+3−2
@@ -20,9 +20,9 @@ import GSettings 1.0
20import Unity.Application 0.1
20import Unity.Application 0.1
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Ubuntu.Components.Popups 1.0
22import Ubuntu.Components.Popups 1.0
23−import Ubuntu.Connectivity 0.1
24import Ubuntu.Gestures 0.1
23import Ubuntu.Gestures 0.1
25import Ubuntu.SystemImage 0.1
24import Ubuntu.SystemImage 0.1
25+import Unity.Connectivity 0.1
26import Unity.Launcher 0.1
26import Unity.Launcher 0.1
27import Utils 0.1
27import Utils 0.1
28import LightDM 0.1 as LightDM
28import LightDM 0.1 as LightDM
@@ -421,9 +421,10 @@ Item {
421 }
421 }
422 }
422 }
423
423
424+ /* TODO re-enable when the corresponding changes in the service land (LP: #1361074)
424 Component.onCompleted: {
425 Component.onCompleted: {
425 Connectivity.unlockAllModems()
426 Connectivity.unlockAllModems()
426− }
427+ } */
427
428
428 onUnlocked: greeter.hide()
429 onUnlocked: greeter.hide()
429 onSelected: {
430 onSelected: {
tests/mocks/Ubuntu/CMakeLists.txt−1
@@ -1,4 +1,3 @@
1−add_subdirectory(Connectivity)
2add_subdirectory(DownloadDaemonListener)
1add_subdirectory(DownloadDaemonListener)
3add_subdirectory(Payments)
2add_subdirectory(Payments)
4add_subdirectory(SystemImage)
3add_subdirectory(SystemImage)
tests/mocks/Unity/CMakeLists.txt+1
@@ -1,4 +1,5 @@
1add_subdirectory(Application)
1add_subdirectory(Application)
2+add_subdirectory(Connectivity)
2add_subdirectory(Indicators)
3add_subdirectory(Indicators)
3add_subdirectory(Launcher)
4add_subdirectory(Launcher)
4add_subdirectory(Notifications)
5add_subdirectory(Notifications)
tests/mocks/Ubuntu/Connectivity/CMakeLists.txt → tests/mocks/Unity/Connectivity/CMakeLists.txtrenamed+1−1
@@ -7,4 +7,4 @@ add_library(MockConnectivity MODULE ${MOCK_CONNECTIVITY_SOURCES})
7
7
8qt5_use_modules(MockConnectivity Qml Quick Core)
8qt5_use_modules(MockConnectivity Qml Quick Core)
9
9
10−add_unity8_mock(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS MockConnectivity)
10+add_unity8_mock(Unity.Connectivity 0.1 Unity/Connectivity TARGETS MockConnectivity)
tests/mocks/Ubuntu/Connectivity/Connectivity.qmltypes → tests/mocks/Unity/Connectivity/Connectivity.qmltypesrenamed+4−2
@@ -4,13 +4,15 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'
7+// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
11 name: "MockConnectivity"
11 name: "MockConnectivity"
12 prototype: "QObject"
12 prototype: "QObject"
13− exports: ["Ubuntu.Connectivity/Connectivity 0.1"]
13+ exports: ["Unity.Connectivity/Connectivity 0.1"]
14+ isCreatable: false
15+ isSingleton: true
14 exportMetaObjectRevisions: [0]
16 exportMetaObjectRevisions: [0]
15 Signal { name: "unlockingAllModems" }
17 Signal { name: "unlockingAllModems" }
16 Method { name: "unlockAllModems" }
18 Method { name: "unlockAllModems" }
tests/mocks/Ubuntu/Connectivity/MockConnectivity.cpp → tests/mocks/Unity/Connectivity/MockConnectivity.cpprenamed

The content is the same.

tests/mocks/Ubuntu/Connectivity/MockConnectivity.h → tests/mocks/Unity/Connectivity/MockConnectivity.hrenamed

The content is the same.

tests/mocks/Ubuntu/Connectivity/plugin.cpp → tests/mocks/Unity/Connectivity/plugin.cpprenamed+1−1
@@ -28,7 +28,7 @@ static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
28
28
29void BackendPlugin::registerTypes(const char *uri)
29void BackendPlugin::registerTypes(const char *uri)
30{
30{
31− Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));
31+ Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
32
32
33 qmlRegisterSingletonType<MockConnectivity>(uri, 0, 1, "Connectivity", service_provider);
33 qmlRegisterSingletonType<MockConnectivity>(uri, 0, 1, "Connectivity", service_provider);
34}
34}
tests/mocks/Ubuntu/Connectivity/plugin.h → tests/mocks/Unity/Connectivity/plugin.hrenamed

The content is the same.

tests/mocks/Ubuntu/Connectivity/qmldir → tests/mocks/Unity/Connectivity/qmldirrenamed+1−1
@@ -1,3 +1,3 @@
1−module Ubuntu.Connectivity
1+module Unity.Connectivity
2plugin MockConnectivity
2plugin MockConnectivity
3typeinfo Connectivity.qmltypes
3typeinfo Connectivity.qmltypes
tests/qmltests/tst_Shell.qml+3−1
@@ -21,8 +21,8 @@ import QtQuick 2.0
21import QtTest 1.0
21import QtTest 1.0
22import GSettings 1.0
22import GSettings 1.0
23import LightDM 0.1 as LightDM
23import LightDM 0.1 as LightDM
24−import Ubuntu.Connectivity 0.1
25import Unity.Application 0.1
24import Unity.Application 0.1
25+import Unity.Connectivity 0.1
26import Unity.Test 0.1 as UT
26import Unity.Test 0.1 as UT
27import Powerd 0.1
27import Powerd 0.1
28
28
@@ -460,6 +460,8 @@ Item {
460 unlockAllModemsSpy.clear()
460 unlockAllModemsSpy.clear()
461 // actually create an object so we notice the onCompleted signal
461 // actually create an object so we notice the onCompleted signal
462 var greeter = shellComponent.createObject(root)
462 var greeter = shellComponent.createObject(root)
463+ // TODO reenable when service ready (LP: #1361074)
464+ expectFail("", "Unlock on boot temporarily disabled");
463 tryCompare(unlockAllModemsSpy, "count", 1)
465 tryCompare(unlockAllModemsSpy, "count", 1)
464 greeter.destroy()
466 greeter.destroy()
465 }
467 }