Move more imports to 1.3
commitb91508dd7fa954f6a02e68297c5977429cd5c285
authorAlbert Astals Cid <albert.astals@canonical.com>
dateFri 10 Jul 2015, 09:47 (11 years ago)
parentcd0d8d8
qml/Components/Header.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import Ubuntu.Components 1.3
18−import Ubuntu.Components.Themes.Ambiance 1.1
18+import Ubuntu.Components.Themes.Ambiance 1.3
1919
2020PageHeadStyle {
2121 id: root
qml/Components/Lockscreen.qml+2−2
@@ -15,8 +15,8 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 1.0
19−import Ubuntu.Components.Popups 1.0
18+import Ubuntu.Components 1.3
19+import Ubuntu.Components.Popups 1.3
2020import Ubuntu.Telephony 0.1 as Telephony
2121
2222Showable {
qml/Components/PinLockscreen.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 0.1
19+import Ubuntu.Components.ListItems 1.3
2020import "../Components"
2121
2222Item {
qml/Components/ShellDialog.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818
1919import Ubuntu.Components 1.3
20−import Ubuntu.Components.Popups 0.1
20+import Ubuntu.Components.Popups 1.3
2121
2222/*
2323 A Dialog configured for use as a proper in-scene Dialog
qml/Dash/DashApplication.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.2
18−import Ubuntu.Components 1.0
18+import Ubuntu.Components 1.3
1919import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
2020
2121MainView {
qml/Dash/DashContentTabBarStyle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import Ubuntu.Components.Themes.Ambiance 0.1
17+import Ubuntu.Components.Themes.Ambiance 1.3
1818
1919TabBarStyle {
2020 indicatorImageSource: "graphics/tabbarchevron.png"
qml/Dash/PageHeader.qml+3−3
@@ -16,9 +16,9 @@
1616
1717import QtQuick 2.2
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.Themes.Ambiance 1.1
20−import Ubuntu.Components.Popups 1.0
21−import Ubuntu.Components.ListItems 1.0
19+import Ubuntu.Components.Themes.Ambiance 1.3
20+import Ubuntu.Components.Popups 1.3
21+import Ubuntu.Components.ListItems 1.3
2222import "../Components"
2323import "../Components/SearchHistoryModel"
2424
qml/Dash/PullToRefreshScopeStyle.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.3
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.Styles 1.1
19+import Ubuntu.Components.Styles 1.3
2020
2121/**
2222 * TODO: Once the SDK version of PullToRefreshStyle doesn't have bug 1375799
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.2
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 1.0 as ListItem
19+import Ubuntu.Components.ListItems 1.3 as ListItem
2020
2121ScopeSetting {
2222 id: root
qml/Dash/ScopeSettings/ScopeSettingList.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.2
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 1.0 as ListItem
19+import Ubuntu.Components.ListItems 1.3 as ListItem
2020
2121ScopeSetting {
2222 id: root
qml/Dash/ScopeSettings/ScopeSettingString.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.2
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 1.0 as ListItem
19+import Ubuntu.Components.ListItems 1.3 as ListItem
2020
2121ScopeSetting {
2222 id: root
qml/Launcher/LauncherPanel.qml+2−2
@@ -16,9 +16,9 @@
1616
1717import QtQuick 2.3
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 1.0 as ListItems
19+import Ubuntu.Components.ListItems 1.3 as ListItems
2020import Unity.Launcher 0.1
21−import Ubuntu.Components.Popups 0.1
21+import Ubuntu.Components.Popups 1.3
2222import "../Components/ListItems"
2323import "../Components/"
2424
qml/Notifications/Notification.qml+1−1
@@ -21,7 +21,7 @@ import Unity.Notifications 1.0
2121import QMenuModel 0.1
2222import Utils 0.1
2323
24−import Ubuntu.Components.ListItems 0.1 as ListItem
24+import Ubuntu.Components.ListItems 1.3 as ListItem
2525
2626Item {
2727 id: notification
qml/Notifications/OptionToggle.qml+2−2
@@ -16,8 +16,8 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 0.1 as ListItem
20−import Ubuntu.Components.Popups 0.1
19+import Ubuntu.Components.ListItems 1.3 as ListItem
20+import Ubuntu.Components.Popups 1.3
2121
2222UbuntuShape {
2323 id: optionToggle
qml/Panel/Indicators/MenuItemFactory.qml+1−1
@@ -22,7 +22,7 @@ import Ubuntu.Settings.Menus 0.1 as Menus
2222import Ubuntu.Settings.Components 0.1
2323import QMenuModel 0.1
2424import Utils 0.1 as Utils
25−import Ubuntu.Components.ListItems 0.1 as ListItems
25+import Ubuntu.Components.ListItems 1.3 as ListItems
2626import Ubuntu.Components 1.3
2727
2828Item {
qml/Panel/Indicators/ModemInfoItem.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtQuick.Layouts 1.1
1919import Ubuntu.Components 1.3
20−import Ubuntu.Components.ListItems 0.1 as ListItem
20+import Ubuntu.Components.ListItems 1.3 as ListItem
2121
2222ListItem.Empty {
2323 id: menu
qml/Panel/Indicators/client/IndicatorRepresentation.qml+1−1
@@ -20,7 +20,7 @@
2020
2121import QtQuick 2.0
2222import Ubuntu.Components 1.3
23−import Ubuntu.Components.ListItems 0.1 as ListItem
23+import Ubuntu.Components.ListItems 1.3 as ListItem
2424import "../.."
2525
2626Page {
qml/Panel/Indicators/client/IndicatorsClient.qml+1−1
@@ -19,7 +19,7 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 1.3
22−import Ubuntu.Components.ListItems 0.1 as ListItem
22+import Ubuntu.Components.ListItems 1.3 as ListItem
2323
2424Rectangle {
2525 color: "black"
qml/Panel/Indicators/client/IndicatorsList.qml+1−1
@@ -19,7 +19,7 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 1.3
22−import Ubuntu.Components.ListItems 0.1 as ListItem
22+import Ubuntu.Components.ListItems 1.3 as ListItem
2323import Unity.Indicators 0.1 as Indicators
2424import "../.."
2525
qml/ScopeTool.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.Popups 0.1
19+import Ubuntu.Components.Popups 1.3
2020import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
2121import Utils 0.1
2222import Unity 0.2
qml/Shell.qml+1−1
@@ -20,7 +20,7 @@ import AccountsService 0.1
2020import GSettings 1.0
2121import Unity.Application 0.1
2222import Ubuntu.Components 1.3
23−import Ubuntu.Components.Popups 1.0
23+import Ubuntu.Components.Popups 1.3
2424import Ubuntu.Gestures 0.1
2525import Ubuntu.Telephony 0.1 as Telephony
2626import Unity.Connectivity 0.1
qml/Stages/PageHeadStyle.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616import QtQuick 2.2
1717import Ubuntu.Components 1.3
18−import Ubuntu.Components.Styles 1.1 as Style
18+import Ubuntu.Components.Styles 1.3 as Style
1919
2020// FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme
2121Style.PageHeadStyle {
qml/Stages/ShimStage.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.3
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.3
1919
2020Rectangle {
2121 id: shimStage
qml/Stages/Splash.qml+4−4
@@ -15,11 +15,11 @@
1515*/
1616
1717import QtQuick 2.2
18−import Ubuntu.Components 1.1
19−import Ubuntu.Components.Themes 0.1
18+import Ubuntu.Components 1.3
19+import Ubuntu.Components.Themes 1.3
2020import "../Components"
2121
22−import Ubuntu.Components.Themes.Ambiance 1.1 as Ambiance
22+import Ubuntu.Components.Themes.Ambiance 1.3 as Ambiance
2323
2424Item {
2525 id: root
@@ -66,7 +66,7 @@ Item {
6666 property var theme: QtObject {
6767 property string name
6868 property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
69− import Ubuntu.Components.Themes.%1 1.1;\
69+ import Ubuntu.Components.Themes.%1 1.3;\
7070 Palette {}".arg(styledItem.theme.name),
7171 styledItem, "dynamicPalette");
7272 }
qml/Wizard/CheckableSetting.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.3
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 1.0 as ListItem
19+import Ubuntu.Components.ListItems 1.3 as ListItem
2020
2121ListItem.Empty {
2222 id: listItem
qml/Wizard/Pages/10-welcome.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.3
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 0.1
19+import Ubuntu.Components.ListItems 1.3
2020import Ubuntu.SystemSettings.LanguagePlugin 1.0
2121import Wizard 0.1
2222import ".." as LocalComponents
qml/Wizard/Pages/30-passwd-type.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.3
1818import Ubuntu.Components 1.3
19−import Ubuntu.Components.ListItems 1.0
19+import Ubuntu.Components.ListItems 1.3
2020import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2121import ".." as LocalComponents
2222
qml/Wizard/Pages/40-wifi.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QMenuModel 0.1 as QMenuModel
1919import QtSystemInfo 5.0
2020import Ubuntu.Components 1.3
21−import Ubuntu.Components.ListItems 0.1 as ListItem
21+import Ubuntu.Components.ListItems 1.3 as ListItem
2222import Ubuntu.Settings.Menus 0.1 as Menus
2323import ".." as LocalComponents
2424
tests/qmltests/Components/tst_ResponsiveGridView.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Components"
21−import Ubuntu.Components.ListItems 0.1 as ListItem
21+import Ubuntu.Components.ListItems 1.3 as ListItem
2222import Ubuntu.Components 1.3
2323import Unity.Test 0.1 as UT
2424
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Components"
21−import Ubuntu.Components.ListItems 0.1 as ListItem
21+import Ubuntu.Components.ListItems 1.3 as ListItem
2222import Ubuntu.Components 1.3
2323import Utils 0.1
2424import Unity.Test 0.1 as UT
tests/qmltests/Stages/tst_ApplicationWindow.qml+1−1
@@ -21,7 +21,7 @@ import Unity.Test 0.1 as UT
2121import ".."
2222import "../../../qml/Stages"
2323import Ubuntu.Components 1.3
24−import Ubuntu.Components.ListItems 1.0 as ListItem
24+import Ubuntu.Components.ListItems 1.3 as ListItem
2525import Unity.Application 0.1
2626
2727Rectangle {
tests/qmltests/Stages/tst_DesktopStage.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
20−import Ubuntu.Components.ListItems 1.0 as ListItem
20+import Ubuntu.Components.ListItems 1.3 as ListItem
2121import Unity.Application 0.1
2222import Unity.Test 0.1
2323import Utils 0.1
tests/qmltests/Stages/tst_SpreadDelegate.qml+1−1
@@ -20,7 +20,7 @@ import Unity.Test 0.1 as UT
2020import ".."
2121import "../../../qml/Stages"
2222import Ubuntu.Components 1.3
23−import Ubuntu.Components.ListItems 1.0 as ListItem
23+import Ubuntu.Components.ListItems 1.3 as ListItem
2424import Unity.Application 0.1
2525
2626Rectangle {
tests/qmltests/Stages/tst_TabletStage.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
20−import Ubuntu.Components.ListItems 1.0 as ListItem
20+import Ubuntu.Components.ListItems 1.3 as ListItem
2121import Unity.Application 0.1
2222import Unity.Test 0.1
2323
tests/qmltests/Stages/tst_WindowMoveResizeArea.qml+1−1
@@ -21,7 +21,7 @@ import Unity.Test 0.1 as UT
2121import ".."
2222import "../../../qml/Stages"
2323import Ubuntu.Components 1.3
24−import Ubuntu.Components.ListItems 1.0 as ListItem
24+import Ubuntu.Components.ListItems 1.3 as ListItem
2525import Unity.Application 0.1
2626
2727Item {
tests/qmltests/tst_OrientedShell.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtQuick.Layouts 1.1
1919import QtTest 1.0
2020import Ubuntu.Components 1.3
21−import Ubuntu.Components.ListItems 1.0 as ListItem
21+import Ubuntu.Components.ListItems 1.3 as ListItem
2222import Unity.Application 0.1
2323import Unity.Test 0.1
2424import LightDM 0.1 as LightDM
tests/qmltests/tst_Shell.qml+1−1
@@ -20,7 +20,7 @@ import AccountsService 0.1
2020import GSettings 1.0
2121import LightDM 0.1 as LightDM
2222import Ubuntu.Components 1.3
23−import Ubuntu.Components.ListItems 1.0 as ListItem
23+import Ubuntu.Components.ListItems 1.3 as ListItem
2424import Ubuntu.Telephony 0.1 as Telephony
2525import Unity.Application 0.1
2626import Unity.Connectivity 0.1
tests/qmltests/tst_ShellWithPin.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 1.0
18+import Ubuntu.Components 1.3
1919import QtTest 1.0
2020import AccountsService 0.1
2121import GSettings 1.0