git.iko.soy/unity8
on xenial help sign in
Bump the import statements to use Unity 0.2
5ddbf57Michal Hruby
Components/PageHeader.qml+1−1
compare with xenial
unifiedsplit
@@ -18,7 +18,7 @@ import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Ubuntu.Components.Popups 0.1
19import Ubuntu.Components.Popups 0.1
20import Ubuntu.Components.ListItems 0.1 as ListItem
20import Ubuntu.Components.ListItems 0.1 as ListItem
21−import Unity 0.1
21+import Unity 0.2
22
22
23Item {
23Item {
24 /*!
24 /*!
Dash/Dash.qml+1−1
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19−import Unity 0.1
19+import Unity 0.2
20import Utils 0.1
20import Utils 0.1
21import "../Components"
21import "../Components"
22
22
Dash/DashBar.qml+1−1
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19−import Unity 0.1
19+import Unity 0.2
20
20
21Item {
21Item {
22 id: dashBar
22 id: dashBar
Dash/DashContent.qml+1−1
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19−import Unity 0.1
19+import Unity 0.2
20
20
21Item {
21Item {
22 id: dashContent
22 id: dashContent
Dash/GenericScopeView.qml+1−1
@@ -17,7 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Utils 0.1
19import Utils 0.1
20−import Unity 0.1
20+import Unity 0.2
21import "../Components"
21import "../Components"
22import "../Components/ListItems" as ListItems
22import "../Components/ListItems" as ListItems
23
23
Dash/SearchableResultModel.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import Utils 0.1
17import Utils 0.1
18−import Unity 0.1
18+import Unity 0.2
19
19
20SortFilterProxyModel {
20SortFilterProxyModel {
21 id: root
21 id: root
Launcher/Launcher.qml−1
@@ -18,7 +18,6 @@ import QtQuick 2.0
18import "../Components"
18import "../Components"
19import Ubuntu.Components 0.1
19import Ubuntu.Components 0.1
20import Ubuntu.Gestures 0.1
20import Ubuntu.Gestures 0.1
21−import Unity 0.1
22import Unity.Launcher 0.1
21import Unity.Launcher 0.1
23
22
24Item {
23Item {
Launcher/LauncherPanel.qml−1
@@ -17,7 +17,6 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Ubuntu.Components.ListItems 0.1 as ListItems
19import Ubuntu.Components.ListItems 0.1 as ListItems
20−import Unity 0.1
21import Unity.Launcher 0.1
20import Unity.Launcher 0.1
22import Ubuntu.Components.Popups 0.1
21import Ubuntu.Components.Popups 0.1
23import "../Components/ListItems"
22import "../Components/ListItems"
tests/mocks/Unity/fake_unity_plugin.cpp+8
@@ -44,4 +44,12 @@ void FakeUnityPlugin::registerTypes(const char *uri)
44 qmlRegisterType<Categories>(uri, 0, 1, "Categories");
44 qmlRegisterType<Categories>(uri, 0, 1, "Categories");
45 qmlRegisterUncreatableType<CategoryResults>(uri, 0, 1, "CategoryResults", "Can't create");
45 qmlRegisterUncreatableType<CategoryResults>(uri, 0, 1, "CategoryResults", "Can't create");
46 qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
46 qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
47+
48+ // same for version 0.2
49+ qmlRegisterUncreatableType<Preview>(uri, 0, 2, "Preview", "Can't create Preview object in QML.");
50+ qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");
51+ qmlRegisterType<Scope>(uri, 0, 2, "Scope");
52+ qmlRegisterType<Categories>(uri, 0, 2, "Categories");
53+ qmlRegisterUncreatableType<CategoryResults>(uri, 0, 2, "CategoryResults", "Can't create");
54+ qmlRegisterType<DeeListModel>(uri, 0, 2, "DeeListModel");
47}
55}