Merge lp:~zsombi/ubuntu-ui-toolkit/fix-import-versions into lp:ubuntu-ui-toolkit/staging

Proposed by Zsombor Egri on 2015-04-25
Status: Merged
Approved by: Christian Dywan on 2015-05-04
Approved revision: 1522
Merged at revision: 1500
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/fix-import-versions
Merge into: lp:ubuntu-ui-toolkit/staging
Prerequisite: lp:~zsombi/ubuntu-ui-toolkit/theming-engine-versioner
Diff against target: 2647 lines (+575/-254)
135 files modified
components.api (+1/-1)
debian/ubuntu-ui-toolkit-theme.install (+17/-1)
documentation/ubuntu-ui-toolkit-common.qdocconf (+1/-1)
examples/1.3/1.3.pro (+10/-0)
examples/1.3/calculator/calculator.qml (+1/-1)
examples/1.3/calculator/components/DefaultLayout.qml (+1/-1)
examples/1.3/calculator/components/Functions.qml (+1/-1)
examples/1.3/jokes/jokes.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/AnimationCircle.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Animations.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Buttons.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Colors.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Dialog.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Icons.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Label.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/ListItemsSection.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Navigation.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/NewListItems.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/OptionSelectors.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Popover.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/ProgressBars.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Sheet.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Sliders.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Template.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TemplateFlow.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TemplateRow.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSection.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/TextInputs.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/Toggles.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/WebLink.qml (+1/-1)
examples/1.3/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+1/-6)
examples/1.3/unit-converter/unit-converter.qml (+7/-8)
examples/examples.pro (+1/-5)
modules/Ubuntu/Components/ActionList.qml (+1/-1)
modules/Ubuntu/Components/Captions.qml (+2/-2)
modules/Ubuntu/Components/ComboButton.qml (+7/-7)
modules/Ubuntu/Components/CrossFadeImage10.qml (+1/-1)
modules/Ubuntu/Components/CrossFadeImage11.qml (+1/-1)
modules/Ubuntu/Components/InputHandler.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Base.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Divider.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Empty.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Expandable.qml (+2/-2)
modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml (+2/-2)
modules/Ubuntu/Components/ListItems/IconVisual.qml (+1/-1)
modules/Ubuntu/Components/ListItems/SingleControl.qml (+2/-2)
modules/Ubuntu/Components/ListItems/Standard.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Subtitled.qml (+1/-1)
modules/Ubuntu/Components/MainView.qml (+3/-4)
modules/Ubuntu/Components/MainView12.qml (+1/-1)
modules/Ubuntu/Components/OptionSelector.qml (+1/-1)
modules/Ubuntu/Components/OptionSelectorDelegate.qml (+2/-2)
modules/Ubuntu/Components/OrientationHelper.qml (+1/-1)
modules/Ubuntu/Components/Page10.qml (+1/-0)
modules/Ubuntu/Components/Page11.qml (+2/-2)
modules/Ubuntu/Components/PageHeadConfiguration13.qml (+1/-1)
modules/Ubuntu/Components/PageHeadSections.qml (+1/-1)
modules/Ubuntu/Components/PageHeadState.qml (+2/-2)
modules/Ubuntu/Components/PageStack.qml (+2/-2)
modules/Ubuntu/Components/Panel.qml (+3/-3)
modules/Ubuntu/Components/Pickers/DatePicker.qml (+4/-4)
modules/Ubuntu/Components/Pickers/DayModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/DialerHandGroup.qml (+1/-1)
modules/Ubuntu/Components/Pickers/HoursModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/MinutesModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/MonthModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/Picker.qml (+1/-1)
modules/Ubuntu/Components/Pickers/PickerPanel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/PickerRow.qml (+1/-1)
modules/Ubuntu/Components/Pickers/SecondsModel.qml (+1/-1)
modules/Ubuntu/Components/Pickers/YearModel.qml (+1/-1)
modules/Ubuntu/Components/Popups/ComposerSheet.qml (+2/-2)
modules/Ubuntu/Components/Popups/DefaultSheet.qml (+2/-2)
modules/Ubuntu/Components/Popups/Dialog.qml (+1/-1)
modules/Ubuntu/Components/Popups/Popover.qml (+1/-1)
modules/Ubuntu/Components/Popups/PopupBase.qml (+1/-1)
modules/Ubuntu/Components/PullToRefresh.qml (+3/-3)
modules/Ubuntu/Components/Tab.qml (+1/-1)
modules/Ubuntu/Components/Tabs.qml (+2/-2)
modules/Ubuntu/Components/TextField.qml (+1/-1)
modules/Ubuntu/Components/Themes/1.2/1.2.pro (+16/-0)
modules/Ubuntu/Components/Themes/1.3/1.3.pro (+14/-0)
modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro (+14/-0)
modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro (+14/-0)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+5/-23)
modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro (+20/-0)
modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro (+14/-0)
modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro (+14/-0)
modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro (+30/-27)
modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro (+22/-0)
modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro (+5/-1)
modules/Ubuntu/Components/Themes/Themes.pro (+3/-0)
modules/Ubuntu/Components/ToolbarButton.qml (+1/-1)
modules/Ubuntu/Components/ToolbarItems.qml (+3/-3)
modules/Ubuntu/Components/UbuntuListView.qml (+2/-2)
modules/Ubuntu/Components/UbuntuNumberAnimation.qml (+2/-2)
modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp (+1/-1)
modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+1/-1)
modules/Ubuntu/Components/plugin/uctheme.cpp (+54/-22)
modules/Ubuntu/Components/plugin/uctheme.h (+21/-3)
modules/Ubuntu/Components/qmldir (+0/-1)
tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py (+3/-2)
tests/unit/tst_components/tst_CrossFadeImage.qml (+6/-6)
tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme (+0/-1)
tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir (+1/-1)
tests/unit_x11/tst_subtheming/DeprecatedTheme.qml (+25/-0)
tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml (+24/-0)
tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml (+24/-0)
tests/unit_x11/tst_subtheming/StyledItemFallback.qml (+24/-0)
tests/unit_x11/tst_subtheming/StyledItemV12.qml (+1/-1)
tests/unit_x11/tst_subtheming/StyledItemV13.qml (+1/-1)
tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir (+1/-1)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+43/-9)
tests/unit_x11/tst_subtheming/tst_subtheming.pro (+7/-2)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/fix-import-versions
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-05-04
Christian Dywan 2015-04-25 Approve on 2015-05-04
Zoltan Balogh 2015-04-25 Pending
Review via email: mp+257454@code.launchpad.net

Commit message

Fix import versions in entire UITK and examples. Move example code under 1.3 folder.

To post a comment you must log in.
Christian Dywan (kalikiana) wrote :

247 qputenv("QML2_IMPORT_PATH", "/no/plugins/here:.");
247 qputenv("QML2_IMPORT_PATH", "/no/plugins/here:./themes");

255 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
255 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");

This seems wrong. These tests ensure that themes are loaded without any defined variables, ie. all packaged click apps run that way. By passing the custom themes folder we no longer test that.

Zsombor Egri (zsombi) wrote :

> 247 qputenv("QML2_IMPORT_PATH", "/no/plugins/here:.");
> 247 qputenv("QML2_IMPORT_PATH", "/no/plugins/here:./themes");
>
> 255 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
> 255 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");
>
> This seems wrong. These tests ensure that themes are loaded without any
> defined variables, ie. all packaged click apps run that way. By passing the
> custom themes folder we no longer test that.

There was a problem that there was the TestModule.TestTheme folder which was in conflict with the shared theme under themes. I thought that was a mistake, but seems not - I copied these tests from the old theming, and back then there was no problems as there was no need for versioning support, which would have had to differentiate the shared and app themes. Now we have.

OTOH, the theming was always running so that having UBUNTU_UI_TOOLKIT_THEMES_PATH set will override XDG_DATA_DIRS and will add whatever path you have to the shared theme lookup paths. So, setting a value of "." actually does affect the theme loading and overrides whatever you have in XDG_DATA_DIRS. I guess that was the intention, otherwise the test is wrong.

I will get the removed app theme back with a different name so we have the test back.

Christian Dywan (kalikiana) wrote :

file:///tmp/tmplf7fdt7n.qml:11:9: QML CheckBox: Warning: Style CheckBoxStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/MainView.qml:124:9: QML AppHeader: Warning: Style HeaderStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/MainViewBase.qml:35:5: QML StyledItem: Warning: Style MainViewStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/Toolbar.qml:121:5: QML StyledItem: Warning: Style ToolbarStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/MainViewBase.qml:42: TypeError: Cannot read property 'normal' of null
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/PageHeadConfiguration11.qml:54: TypeError: Cannot read property 'selected' of null
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/MainView.qml:188: TypeError: Cannot read property '__tabBar' of null

review: Needs Fixing
Zsombor Egri (zsombi) wrote :

> file:///tmp/tmplf7fdt7n.qml:11:9: QML CheckBox: Warning: Style
> CheckBoxStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/MainView.qml:124:9: QML AppHeader:
> Warning: Style HeaderStyle.qml not found in theme
> Ubuntu.Components.Themes.Ambiance
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/MainViewBase.qml:35:5: QML StyledItem:
> Warning: Style MainViewStyle.qml not found in theme
> Ubuntu.Components.Themes.Ambiance
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/Toolbar.qml:121:5: QML StyledItem:
> Warning: Style ToolbarStyle.qml not found in theme
> Ubuntu.Components.Themes.Ambiance
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/MainViewBase.qml:42: TypeError: Cannot
> read property 'normal' of null
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/PageHeadConfiguration11.qml:54: TypeError:
> Cannot read property 'selected' of null
> file:///usr/lib/arm-linux-
> gnueabihf/qt5/qml/Ubuntu/Components/MainView.qml:188: TypeError: Cannot read
> property '__tabBar' of null

What the heck??! Why does it fail on autopilot and has nothing elsewhere?!

Christian Dywan (kalikiana) wrote :

why examples/1.3? seems a bit pointless if we won't have any old ones

- 191 return QUrl::fromLocalFile(absoluteThemeFolder);
+ 189 record.deprecated = QFile::exists(absoluteThemeFolder + "deprecated");
+ 190 record.path = QUrl::fromLocalFile(absoluteThemeFolder);
+ 191 break;

At first glance this seems a bit ugly, though I can live with it. I think we should have a bug about adding this flag to theme meta data eventually - which we'll need once third party themes can be installed and then we won't need this magic file anymore.

+ 706 qmlInfo(parent) << QStringLiteral("Theme '%1' has no '%2' style for version %3.%4, fall back to version %5.%6.")

Should/ could we have a specific warning about the theme being deprecated? So it's clear to an app developer that for instance they should stop using SuruGradient, and not just ponder why it's "incomplete".

review: Needs Information
Zsombor Egri (zsombi) wrote :

> why examples/1.3? seems a bit pointless if we won't have any old ones

The next MR brings examples 1.2 also. The gallery will have to adapt as well.

>
> - 191 return QUrl::fromLocalFile(absoluteThemeFolder);
> + 189 record.deprecated = QFile::exists(absoluteThemeFolder + "deprecated");
> + 190 record.path = QUrl::fromLocalFile(absoluteThemeFolder);
> + 191 break;
>
> At first glance this seems a bit ugly, though I can live with it. I think we
> should have a bug about adding this flag to theme meta data eventually - which
> we'll need once third party themes can be installed and then we won't need
> this magic file anymore.

Yeah, I think we should really need a theme descriptor file, where we can have all sorts of things declared. The deprecated file will vanish once we reach 2.0, and we will only have 2 themes.
>
> + 706 qmlInfo(parent) << QStringLiteral("Theme '%1' has no '%2' style for
> version %3.%4, fall back to version %5.%6.")
>
> Should/ could we have a specific warning about the theme being deprecated? So
> it's clear to an app developer that for instance they should stop using
> SuruGradient, and not just ponder why it's "incomplete".

Yeah, good point. I'll add a note to that, but perhaps at the setName() time, so it only shows once, not for every component creating the style components.

Christian Dywan (kalikiana) wrote :

Alright, we're good then. The qmlinfo tweak isn't essential. Let's see that we sort out those odd Mir failures.

review: Approve
Christian Dywan (kalikiana) wrote :

It seems like some corruption is going on, "test_tst_listitem.qml.xml was length 0" and another supposed failure in x11_tst_mousefilters which suggests that QuickUtils::instance().inputMethodProvider() isn't finding the OSK which depends on the image preinstalling maliit. Let's try again.

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components.api'
2--- components.api 2015-04-25 05:31:43 +0000
3+++ components.api 2015-05-02 11:10:54 +0000
4@@ -246,7 +246,7 @@
5 property Flickable flickable
6 property list<Action> actions
7 Page 1.1
8-Toolkit10.Page
9+Page10
10 readonly property PageHeadConfiguration head
11 Page 1.3
12 PageTreeNode
13
14=== modified file 'debian/ubuntu-ui-toolkit-theme.install'
15--- debian/ubuntu-ui-toolkit-theme.install 2013-06-26 22:44:07 +0000
16+++ debian/ubuntu-ui-toolkit-theme.install 2015-05-02 11:10:54 +0000
17@@ -1,1 +1,17 @@
18-usr/lib/*/qt5/qml/Ubuntu/Components/Themes
19+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/qmldir
20+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/1.2/*.qml
21+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/1.3/*.qml
22+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/qmldir
23+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/artwork
24+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/1.2/*.qml
25+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/1.3/*.qml
26+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/qmldir
27+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/parent_theme
28+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/artwork
29+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/1.2/*.qml
30+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/1.3/*.qml
31+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/qmldir
32+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/deprecated
33+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/parent_theme
34+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/artwork
35+usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/*.qml
36
37=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
38--- documentation/ubuntu-ui-toolkit-common.qdocconf 2015-04-17 07:39:12 +0000
39+++ documentation/ubuntu-ui-toolkit-common.qdocconf 2015-05-02 11:10:54 +0000
40@@ -11,7 +11,7 @@
41 sourcedirs += ../modules/Ubuntu/Test
42 headerdirs += ../modules/Ubuntu/Test/plugin
43 exampledirs += snippets
44-exampledirs += ../examples
45+exampledirs += ../examples/1.3
46 exampledirs += ../modules/Ubuntu/Components
47 excludedirs += ../modules/Ubuntu/Components/Themes/Ambiance
48 excludedirs += ../modules/Ubuntu/Components/Themes/SuruDark
49
50=== added directory 'examples/1.3'
51=== added file 'examples/1.3/1.3.pro'
52--- examples/1.3/1.3.pro 1970-01-01 00:00:00 +0000
53+++ examples/1.3/1.3.pro 2015-05-02 11:10:54 +0000
54@@ -0,0 +1,10 @@
55+TEMPLATE = subdirs
56+
57+SUBDIRS += \
58+ ubuntu-ui-toolkit-gallery\
59+ locale \
60+ jokes \
61+ unit-converter \
62+ calculator \
63+ customtheme
64+
65
66=== renamed directory 'examples/calculator' => 'examples/1.3/calculator'
67=== modified file 'examples/1.3/calculator/calculator.qml'
68--- examples/calculator/calculator.qml 2015-03-03 13:47:48 +0000
69+++ examples/1.3/calculator/calculator.qml 2015-05-02 11:10:54 +0000
70@@ -17,7 +17,7 @@
71 */
72
73 import QtQuick 2.0
74-import Ubuntu.Components 1.2
75+import Ubuntu.Components 1.3
76 import Ubuntu.Layouts 1.0
77 import "components"
78 import "components/calculator.js" as Calculator
79
80=== modified file 'examples/1.3/calculator/components/DefaultLayout.qml'
81--- examples/calculator/components/DefaultLayout.qml 2015-03-03 13:47:48 +0000
82+++ examples/1.3/calculator/components/DefaultLayout.qml 2015-05-02 11:10:54 +0000
83@@ -17,7 +17,7 @@
84 */
85
86 import QtQuick 2.0
87-import Ubuntu.Components 1.2
88+import Ubuntu.Components 1.3
89 import Ubuntu.Layouts 1.0
90
91 Item {
92
93=== modified file 'examples/1.3/calculator/components/Functions.qml'
94--- examples/calculator/components/Functions.qml 2015-03-03 13:47:48 +0000
95+++ examples/1.3/calculator/components/Functions.qml 2015-05-02 11:10:54 +0000
96@@ -17,7 +17,7 @@
97 */
98
99 import QtQuick 2.0
100-import Ubuntu.Components 1.2
101+import Ubuntu.Components 1.3
102 import Ubuntu.Layouts 1.0
103
104 Grid {
105
106=== renamed directory 'examples/customtheme' => 'examples/1.3/customtheme'
107=== renamed directory 'examples/jokes' => 'examples/1.3/jokes'
108=== modified file 'examples/1.3/jokes/jokes.qml'
109--- examples/jokes/jokes.qml 2015-03-03 13:47:48 +0000
110+++ examples/1.3/jokes/jokes.qml 2015-05-02 11:10:54 +0000
111@@ -16,7 +16,7 @@
112 */
113
114 import QtQuick 2.0
115-import Ubuntu.Components 1.2
116+import Ubuntu.Components 1.3
117 import QtMultimedia 5.0
118
119 /*!
120
121=== renamed directory 'examples/locale' => 'examples/1.3/locale'
122=== renamed directory 'examples/ubuntu-ui-toolkit-gallery' => 'examples/1.3/ubuntu-ui-toolkit-gallery'
123=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/AnimationCircle.qml'
124--- examples/ubuntu-ui-toolkit-gallery/AnimationCircle.qml 2015-03-03 13:20:06 +0000
125+++ examples/1.3/ubuntu-ui-toolkit-gallery/AnimationCircle.qml 2015-05-02 11:10:54 +0000
126@@ -15,7 +15,7 @@
127 */
128
129 import QtQuick 2.0
130-import Ubuntu.Components 0.1
131+import Ubuntu.Components 1.3
132
133 Rectangle {
134 id: circle
135
136=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Animations.qml'
137--- examples/ubuntu-ui-toolkit-gallery/Animations.qml 2015-03-03 13:20:06 +0000
138+++ examples/1.3/ubuntu-ui-toolkit-gallery/Animations.qml 2015-05-02 11:10:54 +0000
139@@ -15,7 +15,7 @@
140 */
141
142 import QtQuick 2.0
143-import Ubuntu.Components 0.1
144+import Ubuntu.Components 1.3
145
146 Template {
147 objectName: "animationsTemplate"
148
149=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Buttons.qml'
150--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml 2015-03-03 13:47:48 +0000
151+++ examples/1.3/ubuntu-ui-toolkit-gallery/Buttons.qml 2015-05-02 11:10:54 +0000
152@@ -15,7 +15,7 @@
153 */
154
155 import QtQuick 2.4
156-import Ubuntu.Components 1.2
157+import Ubuntu.Components 1.3
158 import Ubuntu.Components.ListItems 1.0
159
160 Template {
161
162=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Colors.qml'
163--- examples/ubuntu-ui-toolkit-gallery/Colors.qml 2015-03-03 13:47:48 +0000
164+++ examples/1.3/ubuntu-ui-toolkit-gallery/Colors.qml 2015-05-02 11:10:54 +0000
165@@ -15,7 +15,7 @@
166 */
167
168 import QtQuick 2.4
169-import Ubuntu.Components 1.2
170+import Ubuntu.Components 1.3
171
172 Template {
173 objectName: "colorsTemplate"
174
175=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml'
176--- examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml 2015-03-11 17:10:20 +0000
177+++ examples/1.3/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml 2015-05-02 11:10:54 +0000
178@@ -15,7 +15,7 @@
179 */
180
181 import QtQuick 2.4
182-import Ubuntu.Components 1.2
183+import Ubuntu.Components 1.3
184
185 Template {
186 objectName: "crossFadeImagesTemplate"
187
188=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Dialog.qml'
189--- examples/ubuntu-ui-toolkit-gallery/Dialog.qml 2015-03-11 17:10:20 +0000
190+++ examples/1.3/ubuntu-ui-toolkit-gallery/Dialog.qml 2015-05-02 11:10:54 +0000
191@@ -15,7 +15,7 @@
192 */
193
194 import QtQuick 2.4
195-import Ubuntu.Components 1.2
196+import Ubuntu.Components 1.3
197 import Ubuntu.Components.Popups 1.0
198
199 Template {
200
201=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Icons.qml'
202--- examples/ubuntu-ui-toolkit-gallery/Icons.qml 2015-03-03 13:20:06 +0000
203+++ examples/1.3/ubuntu-ui-toolkit-gallery/Icons.qml 2015-05-02 11:10:54 +0000
204@@ -15,7 +15,7 @@
205 */
206
207 import QtQuick 2.0
208-import Ubuntu.Components 1.0
209+import Ubuntu.Components 1.3
210 import Ubuntu.Components.ListItems 0.1 as ListItem
211 import Ubuntu.Components.Popups 1.0
212 import Qt.labs.folderlistmodel 2.1
213
214=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Label.qml'
215--- examples/ubuntu-ui-toolkit-gallery/Label.qml 2015-03-03 13:20:06 +0000
216+++ examples/1.3/ubuntu-ui-toolkit-gallery/Label.qml 2015-05-02 11:10:54 +0000
217@@ -15,7 +15,7 @@
218 */
219
220 import QtQuick 2.0
221-import Ubuntu.Components 1.0
222+import Ubuntu.Components 1.3
223
224 Template {
225 objectName: "labelsTemplate"
226
227=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml'
228--- examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml 2015-02-18 11:16:32 +0000
229+++ examples/1.3/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml 2015-05-02 11:10:54 +0000
230@@ -15,7 +15,7 @@
231 */
232
233 import QtQuick 2.2
234-import Ubuntu.Components 1.2
235+import Ubuntu.Components 1.3
236
237 ListItem {
238 property alias text: label.text
239
240=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ListItemsSection.qml'
241--- examples/ubuntu-ui-toolkit-gallery/ListItemsSection.qml 2015-03-03 13:20:06 +0000
242+++ examples/1.3/ubuntu-ui-toolkit-gallery/ListItemsSection.qml 2015-05-02 11:10:54 +0000
243@@ -15,7 +15,7 @@
244 */
245
246 import QtQuick 2.0
247-import Ubuntu.Components 0.1
248+import Ubuntu.Components 1.3
249
250 TemplateSection {
251 id: section
252
253=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Navigation.qml'
254--- examples/ubuntu-ui-toolkit-gallery/Navigation.qml 2015-03-05 09:35:06 +0000
255+++ examples/1.3/ubuntu-ui-toolkit-gallery/Navigation.qml 2015-05-02 11:10:54 +0000
256@@ -15,7 +15,7 @@
257 */
258
259 import QtQuick 2.0
260-import Ubuntu.Components 0.1
261+import Ubuntu.Components 1.3
262
263 Template {
264 objectName: "navigationTemplate"
265
266=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/NewListItems.qml'
267--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml 2015-02-25 14:14:05 +0000
268+++ examples/1.3/ubuntu-ui-toolkit-gallery/NewListItems.qml 2015-05-02 11:10:54 +0000
269@@ -15,7 +15,7 @@
270 */
271
272 import QtQuick 2.2
273-import Ubuntu.Components 1.2
274+import Ubuntu.Components 1.3
275
276 Template {
277 objectName: "listItemsTemplate"
278
279=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/OptionSelectors.qml'
280--- examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml 2015-03-11 17:10:20 +0000
281+++ examples/1.3/ubuntu-ui-toolkit-gallery/OptionSelectors.qml 2015-05-02 11:10:54 +0000
282@@ -15,7 +15,7 @@
283 */
284
285 import QtQuick 2.0
286-import Ubuntu.Components 0.1
287+import Ubuntu.Components 1.3
288
289 Template {
290 objectName: "optionSelectorsTemplate"
291
292=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Popover.qml'
293--- examples/ubuntu-ui-toolkit-gallery/Popover.qml 2015-03-11 17:10:20 +0000
294+++ examples/1.3/ubuntu-ui-toolkit-gallery/Popover.qml 2015-05-02 11:10:54 +0000
295@@ -15,7 +15,7 @@
296 */
297
298 import QtQuick 2.0
299-import Ubuntu.Components 0.1
300+import Ubuntu.Components 1.3
301 import Ubuntu.Components.Popups 0.1
302
303 Template {
304
305=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ProgressBars.qml'
306--- examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml 2015-03-12 09:15:35 +0000
307+++ examples/1.3/ubuntu-ui-toolkit-gallery/ProgressBars.qml 2015-05-02 11:10:54 +0000
308@@ -15,7 +15,7 @@
309 */
310
311 import QtQuick 2.4
312-import Ubuntu.Components 1.2
313+import Ubuntu.Components 1.3
314
315 Template {
316 objectName: "progressBarsTemplate"
317
318=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Sheet.qml'
319--- examples/ubuntu-ui-toolkit-gallery/Sheet.qml 2015-03-11 17:10:20 +0000
320+++ examples/1.3/ubuntu-ui-toolkit-gallery/Sheet.qml 2015-05-02 11:10:54 +0000
321@@ -15,7 +15,7 @@
322 */
323
324 import QtQuick 2.0
325-import Ubuntu.Components 0.1
326+import Ubuntu.Components 1.3
327 import Ubuntu.Components.Popups 0.1
328
329 Template {
330
331=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Sliders.qml'
332--- examples/ubuntu-ui-toolkit-gallery/Sliders.qml 2015-03-20 21:25:13 +0000
333+++ examples/1.3/ubuntu-ui-toolkit-gallery/Sliders.qml 2015-05-02 11:10:54 +0000
334@@ -15,7 +15,7 @@
335 */
336
337 import QtQuick 2.0
338-import Ubuntu.Components 0.1
339+import Ubuntu.Components 1.3
340
341 Template {
342 objectName: "slidersTemplate"
343
344=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Template.qml'
345--- examples/ubuntu-ui-toolkit-gallery/Template.qml 2015-03-03 13:20:06 +0000
346+++ examples/1.3/ubuntu-ui-toolkit-gallery/Template.qml 2015-05-02 11:10:54 +0000
347@@ -15,7 +15,7 @@
348 */
349
350 import QtQuick 2.0
351-import Ubuntu.Components 0.1
352+import Ubuntu.Components 1.3
353
354 Item {
355 id: template
356
357=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateFlow.qml'
358--- examples/ubuntu-ui-toolkit-gallery/TemplateFlow.qml 2015-03-03 13:20:06 +0000
359+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateFlow.qml 2015-05-02 11:10:54 +0000
360@@ -15,7 +15,7 @@
361 */
362
363 import QtQuick 2.0
364-import Ubuntu.Components 0.1
365+import Ubuntu.Components 1.3
366
367 Item {
368 id: templateFlow
369
370=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateRow.qml'
371--- examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml 2015-03-03 13:20:06 +0000
372+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateRow.qml 2015-05-02 11:10:54 +0000
373@@ -15,7 +15,7 @@
374 */
375
376 import QtQuick 2.0
377-import Ubuntu.Components 0.1
378+import Ubuntu.Components 1.3
379
380 Item {
381 id: templateRow
382
383=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSection.qml'
384--- examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml 2015-03-03 13:20:06 +0000
385+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSection.qml 2015-05-02 11:10:54 +0000
386@@ -15,7 +15,7 @@
387 */
388
389 import QtQuick 2.0
390-import Ubuntu.Components 0.1
391+import Ubuntu.Components 1.3
392
393 Column {
394 id: templateSection
395
396=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml'
397--- examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml 2015-03-03 13:20:06 +0000
398+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml 2015-05-02 11:10:54 +0000
399@@ -15,7 +15,7 @@
400 */
401
402 import QtQuick 2.0
403-import Ubuntu.Components 0.1
404+import Ubuntu.Components 1.3
405
406 Column {
407 id: templateSection
408
409=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TextInputs.qml'
410--- examples/ubuntu-ui-toolkit-gallery/TextInputs.qml 2015-03-10 11:49:27 +0000
411+++ examples/1.3/ubuntu-ui-toolkit-gallery/TextInputs.qml 2015-05-02 11:10:54 +0000
412@@ -15,7 +15,7 @@
413 */
414
415 import QtQuick 2.0
416-import Ubuntu.Components 0.1
417+import Ubuntu.Components 1.3
418
419 Template {
420 objectName: "textinputsTemplate"
421
422=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Toggles.qml'
423--- examples/ubuntu-ui-toolkit-gallery/Toggles.qml 2015-03-03 13:20:06 +0000
424+++ examples/1.3/ubuntu-ui-toolkit-gallery/Toggles.qml 2015-05-02 11:10:54 +0000
425@@ -15,7 +15,7 @@
426 */
427
428 import QtQuick 2.0
429-import Ubuntu.Components 0.1
430+import Ubuntu.Components 1.3
431
432 Template {
433 objectName: "togglesTemplate"
434
435=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml'
436--- examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml 2015-03-03 13:47:48 +0000
437+++ examples/1.3/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml 2015-05-02 11:10:54 +0000
438@@ -15,7 +15,7 @@
439 */
440
441 import QtQuick 2.4
442-import Ubuntu.Components 1.2
443+import Ubuntu.Components 1.3
444 import Ubuntu.Components.ListItems 1.0 as ListItem
445
446 Template {
447
448=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/WebLink.qml'
449--- examples/ubuntu-ui-toolkit-gallery/WebLink.qml 2015-04-01 08:44:56 +0000
450+++ examples/1.3/ubuntu-ui-toolkit-gallery/WebLink.qml 2015-05-02 11:10:54 +0000
451@@ -15,7 +15,7 @@
452 */
453
454 import QtQuick 2.0
455-import Ubuntu.Components 0.1
456+import Ubuntu.Components 1.3
457
458 Label {
459 id: webLink
460
461=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
462--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2015-03-03 13:47:48 +0000
463+++ examples/1.3/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2015-05-02 11:10:54 +0000
464@@ -15,7 +15,7 @@
465 */
466
467 import QtQuick 2.4
468-import Ubuntu.Components 1.1 // keep 1.1 till we remove the deprecated toolbar and toolbar in general
469+import Ubuntu.Components 1.3
470 import Ubuntu.Components.ListItems 0.1 as ListItem
471
472 MainView {
473@@ -26,8 +26,6 @@
474 // Note! applicationName needs to match the .desktop filename
475 applicationName: "ubuntu-ui-toolkit-gallery"
476
477- useDeprecatedToolbar: false
478-
479 width: units.gu(120)
480 height: units.gu(75)
481
482@@ -145,9 +143,6 @@
483 selectedWidget = null;
484 }
485
486- ToolbarItems{ id: defTools}
487- tools: contentLoader.item && contentLoader.item.tools ? contentLoader.item.tools : defTools
488-
489 Loader {
490 id: contentLoader
491 objectName: "contentLoader"
492
493=== renamed directory 'examples/unit-converter' => 'examples/1.3/unit-converter'
494=== modified file 'examples/1.3/unit-converter/unit-converter.qml'
495--- examples/unit-converter/unit-converter.qml 2015-03-03 13:47:48 +0000
496+++ examples/1.3/unit-converter/unit-converter.qml 2015-05-02 11:10:54 +0000
497@@ -15,7 +15,7 @@
498 */
499
500 import QtQuick 2.4
501-import Ubuntu.Components 1.2
502+import Ubuntu.Components 1.3
503 import "conversion.js" as Converter
504
505 /*!
506@@ -140,13 +140,12 @@
507 }
508 }
509 }
510- tools: ToolbarActions {
511- Action {
512- objectName: "action"
513- iconSource: Qt.resolvedUrl("toolbarIcon.png")
514- text: i18n.tr("Clear")
515- onTriggered: Converter.clear(converter)
516- }
517+
518+ head.actions: Action {
519+ objectName: "action"
520+ iconName: "clear"
521+ text: i18n.tr("Clear")
522+ onTriggered: Converter.clear(converter)
523 }
524 }
525 }
526
527=== modified file 'examples/examples.pro'
528--- examples/examples.pro 2015-04-15 12:03:50 +0000
529+++ examples/examples.pro 2015-05-02 11:10:54 +0000
530@@ -1,11 +1,7 @@
531 TEMPLATE = subdirs
532
533 SUBDIRS += \
534- ubuntu-ui-toolkit-gallery\
535- locale \
536- unit-converter \
537- calculator \
538- customtheme
539+ 1.3
540
541
542 #examples = jokes unit-converter
543
544=== modified file 'modules/Ubuntu/Components/ActionList.qml'
545--- modules/Ubuntu/Components/ActionList.qml 2015-03-03 13:47:48 +0000
546+++ modules/Ubuntu/Components/ActionList.qml 2015-05-02 11:10:54 +0000
547@@ -15,7 +15,7 @@
548 */
549
550 import QtQuick 2.4
551-import Ubuntu.Components 1.2
552+import Ubuntu.Components 1.3
553
554 /*!
555 \qmltype ActionList
556
557=== modified file 'modules/Ubuntu/Components/Captions.qml'
558--- modules/Ubuntu/Components/Captions.qml 2015-03-03 14:23:22 +0000
559+++ modules/Ubuntu/Components/Captions.qml 2015-05-02 11:10:54 +0000
560@@ -16,7 +16,7 @@
561
562 import QtQuick 2.4
563 import QtQuick.Layouts 1.1
564-import Ubuntu.Components 1.2
565+import Ubuntu.Components 1.3
566
567 /*!
568 \qmltype Captions
569@@ -37,7 +37,7 @@
570
571 \qml
572 import QtQuick 2.4
573- import Ubuntu.Components 1.2
574+ import Ubuntu.Components 1.3
575
576 ListItem {
577 RowLayout {
578
579=== modified file 'modules/Ubuntu/Components/ComboButton.qml'
580--- modules/Ubuntu/Components/ComboButton.qml 2015-04-09 09:42:36 +0000
581+++ modules/Ubuntu/Components/ComboButton.qml 2015-05-02 11:10:54 +0000
582@@ -42,7 +42,7 @@
583 list will be expanded only to the height of the content.
584 \qml
585 import QtQuick 2.4
586- import Ubuntu.Components 1.2
587+ import Ubuntu.Components 1.3
588 ComboButton {
589 text: "smaller content"
590 Rectangle {
591@@ -58,7 +58,7 @@
592 itself.
593 \qml
594 import QtQuick 2.4
595- import Ubuntu.Components 1.2
596+ import Ubuntu.Components 1.3
597 ComboButton {
598 text: "long scrolled content"
599 Column {
600@@ -77,7 +77,7 @@
601 the content will be filling the entire combo list area defined.
602 \qml
603 import QtQuick 2.4
604- import Ubuntu.Components 1.2
605+ import Ubuntu.Components 1.3
606 import Ubuntu.Components.ListItems 1.0
607 ComboButton {
608 text: "listview"
609@@ -95,7 +95,7 @@
610 bind its height to the \l comboListHeight property.
611 \qml
612 import QtQuick 2.4
613- import Ubuntu.Components 1.2
614+ import Ubuntu.Components 1.3
615 ComboButton {
616 id: combo
617 text: "smaller content"
618@@ -109,7 +109,7 @@
619 expandedHeight should be set to -1.
620 \qml
621 import QtQuick 2.4
622- import Ubuntu.Components 1.2
623+ import Ubuntu.Components 1.3
624 ComboButton {
625 text: "auto-sized content"
626 expandedHeight: -1
627@@ -135,7 +135,7 @@
628
629 \qml
630 import QtQuick 2.4
631- import Ubuntu.Components 1.2
632+ import Ubuntu.Components 1.3
633
634 ComboButton {
635 id: combo
636@@ -202,7 +202,7 @@
637 that can be used to size the combo list content.
638 \qml
639 import QtQuick 2.4
640- import Ubuntu.Components 1.2
641+ import Ubuntu.Components 1.3
642 import Ubuntu.Components.ListItems 0.1
643 ComboButton {
644 id: combo
645
646=== modified file 'modules/Ubuntu/Components/CrossFadeImage10.qml'
647--- modules/Ubuntu/Components/CrossFadeImage10.qml 2015-03-03 13:47:48 +0000
648+++ modules/Ubuntu/Components/CrossFadeImage10.qml 2015-05-02 11:10:54 +0000
649@@ -19,7 +19,7 @@
650 // we need to use named imports otherwise namespace collision is reported
651 // by the QML engine. As workaround, we use Ubuntu named import.
652 // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
653-import Ubuntu.Components 1.2 as Ubuntu
654+import Ubuntu.Components 1.3 as Ubuntu
655
656 /*!
657 \internal
658
659=== modified file 'modules/Ubuntu/Components/CrossFadeImage11.qml'
660--- modules/Ubuntu/Components/CrossFadeImage11.qml 2015-03-03 13:47:48 +0000
661+++ modules/Ubuntu/Components/CrossFadeImage11.qml 2015-05-02 11:10:54 +0000
662@@ -19,7 +19,7 @@
663 // we need to use named imports otherwise namespace collision is reported
664 // by the QML engine. As workaround, we use Ubuntu named import.
665 // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
666-import Ubuntu.Components 1.2 as Ubuntu
667+import Ubuntu.Components 1.3 as Ubuntu
668
669 /*!
670 \internal
671
672=== modified file 'modules/Ubuntu/Components/InputHandler.qml'
673--- modules/Ubuntu/Components/InputHandler.qml 2015-03-10 11:49:27 +0000
674+++ modules/Ubuntu/Components/InputHandler.qml 2015-05-02 11:10:54 +0000
675@@ -15,7 +15,7 @@
676 */
677
678 import QtQuick 2.4
679-import Ubuntu.Components 1.2
680+import Ubuntu.Components 1.3
681
682 /*
683 This component is a unified text selection and scrolling handler for both
684
685=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
686--- modules/Ubuntu/Components/ListItems/Base.qml 2015-03-03 13:47:48 +0000
687+++ modules/Ubuntu/Components/ListItems/Base.qml 2015-05-02 11:10:54 +0000
688@@ -15,7 +15,7 @@
689 */
690
691 import QtQuick 2.4
692-import Ubuntu.Components 1.2
693+import Ubuntu.Components 1.3
694
695 /*!
696 \qmltype Base
697
698=== modified file 'modules/Ubuntu/Components/ListItems/Divider.qml'
699--- modules/Ubuntu/Components/ListItems/Divider.qml 2015-03-03 13:47:48 +0000
700+++ modules/Ubuntu/Components/ListItems/Divider.qml 2015-05-02 11:10:54 +0000
701@@ -15,7 +15,7 @@
702 */
703
704 import QtQuick 2.4
705-import Ubuntu.Components 1.2
706+import Ubuntu.Components 1.3
707
708 /*!
709 \qmltype Divider
710
711=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
712--- modules/Ubuntu/Components/ListItems/Empty.qml 2015-04-09 09:42:36 +0000
713+++ modules/Ubuntu/Components/ListItems/Empty.qml 2015-05-02 11:10:54 +0000
714@@ -35,7 +35,7 @@
715
716 Examples:
717 \qml
718- import Ubuntu.Components 1.2
719+ import Ubuntu.Components 1.3
720 import Ubuntu.Components.ListItems 1.0 as ListItem
721
722 Item {
723
724=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
725--- modules/Ubuntu/Components/ListItems/Expandable.qml 2015-03-03 13:47:48 +0000
726+++ modules/Ubuntu/Components/ListItems/Expandable.qml 2015-05-02 11:10:54 +0000
727@@ -14,7 +14,7 @@
728 * along with this program. If not, see <http://www.gnu.org/licenses/>.
729 */
730 import QtQuick 2.4
731-import Ubuntu.Components 1.2
732+import Ubuntu.Components 1.3
733
734 /*!
735 \qmltype Expandable
736@@ -35,7 +35,7 @@
737
738 Examples:
739 \qml
740- import Ubuntu.Components 1.2
741+ import Ubuntu.Components 1.3
742 import Ubuntu.Components.ListItems 1.0 as ListItem
743
744 Item {
745
746=== modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml'
747--- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml 2015-03-03 13:47:48 +0000
748+++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml 2015-05-02 11:10:54 +0000
749@@ -15,7 +15,7 @@
750 */
751
752 import QtQuick 2.4
753-import Ubuntu.Components 1.2
754+import Ubuntu.Components 1.3
755
756 /*!
757 \qmltype ExpandablesColumn
758@@ -29,7 +29,7 @@
759
760 Examples:
761 \qml
762- import Ubuntu.Components 1.2
763+ import Ubuntu.Components 1.3
764 import Ubuntu.Components.ListItems 1.0 as ListItem
765
766 ListItem.ExpandablesColumn {
767
768=== modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml'
769--- modules/Ubuntu/Components/ListItems/IconVisual.qml 2015-03-03 13:47:48 +0000
770+++ modules/Ubuntu/Components/ListItems/IconVisual.qml 2015-05-02 11:10:54 +0000
771@@ -15,7 +15,7 @@
772 */
773
774 import QtQuick 2.4
775-import Ubuntu.Components 1.2
776+import Ubuntu.Components 1.3
777
778 // internal helper class to create the visuals
779 // for the icon.
780
781=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
782--- modules/Ubuntu/Components/ListItems/SingleControl.qml 2015-03-03 13:47:48 +0000
783+++ modules/Ubuntu/Components/ListItems/SingleControl.qml 2015-05-02 11:10:54 +0000
784@@ -15,7 +15,7 @@
785 */
786
787 import QtQuick 2.4
788-import Ubuntu.Components 1.2
789+import Ubuntu.Components 1.3
790 import Ubuntu.Components.ListItems 1.0
791
792 /*!
793@@ -27,7 +27,7 @@
794
795 Examples:
796 \qml
797- import Ubuntu.Components 1.2
798+ import Ubuntu.Components 1.3
799 import Ubuntu.Components.ListItems 1.0 as ListItem
800 Column {
801 ListItem.SingleControl {
802
803=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
804--- modules/Ubuntu/Components/ListItems/Standard.qml 2015-04-09 09:42:36 +0000
805+++ modules/Ubuntu/Components/ListItems/Standard.qml 2015-05-02 11:10:54 +0000
806@@ -31,7 +31,7 @@
807
808 Examples:
809 \qml
810- import Ubuntu.Components 1.2
811+ import Ubuntu.Components 1.3
812 import Ubuntu.Components.ListItems 1.0 as ListItem
813 Column {
814 ListItem.Standard {
815
816=== modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml'
817--- modules/Ubuntu/Components/ListItems/Subtitled.qml 2015-03-03 13:47:48 +0000
818+++ modules/Ubuntu/Components/ListItems/Subtitled.qml 2015-05-02 11:10:54 +0000
819@@ -15,7 +15,7 @@
820 */
821
822 import QtQuick 2.4
823-import Ubuntu.Components 1.2
824+import Ubuntu.Components 1.3
825
826 /*!
827 \qmltype MultiValue
828
829=== modified file 'modules/Ubuntu/Components/MainView.qml'
830--- modules/Ubuntu/Components/MainView.qml 2015-03-20 11:40:48 +0000
831+++ modules/Ubuntu/Components/MainView.qml 2015-05-02 11:10:54 +0000
832@@ -15,7 +15,6 @@
833 */
834
835 import QtQuick 2.4
836-import Ubuntu.Components 1.2 as Toolkit
837 import Ubuntu.PerformanceMetrics 1.0
838 import QtQuick.Window 2.0
839
840@@ -137,7 +136,7 @@
841 flickable: internal.activePage ? internal.activePage.flickable : null
842 pageStack: internal.activePage ? internal.activePage.pageStack : null
843
844- Toolkit.PageHeadConfiguration {
845+ PageHeadConfiguration11 {
846 id: headerConfig
847 // for backwards compatibility with deprecated tools property
848 actions: internal.activePage ?
849@@ -243,8 +242,8 @@
850 id: internal
851
852 // Even when using MainView 1.1, we still support Page 1.0.
853- // PageBase (=Page 1.0) is the superclass of Page 1.1.
854- property PageBase activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
855+ // we use PageTreeNode being the base class of all pages.
856+ property PageTreeNode activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
857
858 function isPage(item) {
859 return item && item.hasOwnProperty("__isPageTreeNode") && item.__isPageTreeNode &&
860
861=== modified file 'modules/Ubuntu/Components/MainView12.qml'
862--- modules/Ubuntu/Components/MainView12.qml 2015-03-20 11:40:48 +0000
863+++ modules/Ubuntu/Components/MainView12.qml 2015-05-02 11:10:54 +0000
864@@ -15,7 +15,7 @@
865 */
866
867 import QtQuick 2.4
868-import Ubuntu.Components 1.2 as Toolkit
869+import Ubuntu.Components 1.3 as Toolkit
870 import Ubuntu.PerformanceMetrics 1.0
871 import QtQuick.Window 2.2
872
873
874=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
875--- modules/Ubuntu/Components/OptionSelector.qml 2015-04-24 12:00:23 +0000
876+++ modules/Ubuntu/Components/OptionSelector.qml 2015-05-02 11:10:54 +0000
877@@ -27,7 +27,7 @@
878
879 Examples:
880 \qml
881- import Ubuntu.Components 1.2
882+ import Ubuntu.Components 1.3
883 Column {
884 spacing: units.gu(3)
885
886
887=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
888--- modules/Ubuntu/Components/OptionSelectorDelegate.qml 2015-03-03 13:47:48 +0000
889+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml 2015-05-02 11:10:54 +0000
890@@ -22,7 +22,7 @@
891
892 Examples:
893 \qml
894- import Ubuntu.Components 1.2
895+ import Ubuntu.Components 1.3
896 Column {
897 width: 250
898 OptionSelector {
899@@ -43,7 +43,7 @@
900
901 import QtQuick 2.4
902 import "ListItems" as ListItem
903-import Ubuntu.Components 1.2 as Toolkit
904+import Ubuntu.Components 1.3 as Toolkit
905
906 ListItem.Empty {
907 id: option
908
909=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
910--- modules/Ubuntu/Components/OrientationHelper.qml 2015-03-06 07:55:23 +0000
911+++ modules/Ubuntu/Components/OrientationHelper.qml 2015-05-02 11:10:54 +0000
912@@ -16,7 +16,7 @@
913
914 import QtQuick 2.4
915 import QtQuick.Window 2.0
916-import Ubuntu.Components 1.2
917+import Ubuntu.Components 1.3
918
919 /*!
920 \qmltype OrientationHelper
921
922=== modified file 'modules/Ubuntu/Components/Page10.qml'
923--- modules/Ubuntu/Components/Page10.qml 2015-03-20 11:05:40 +0000
924+++ modules/Ubuntu/Components/Page10.qml 2015-05-02 11:10:54 +0000
925@@ -15,6 +15,7 @@
926 */
927
928 import QtQuick 2.4
929+// FIXME must merge Page10, Page11 and Page13 files
930 import Ubuntu.Components 1.0 as Toolkit
931 import "pageUtils.js" as Utils
932
933
934=== modified file 'modules/Ubuntu/Components/Page11.qml'
935--- modules/Ubuntu/Components/Page11.qml 2015-03-23 16:13:33 +0000
936+++ modules/Ubuntu/Components/Page11.qml 2015-05-02 11:10:54 +0000
937@@ -15,12 +15,12 @@
938 */
939
940 import QtQuick 2.4
941-import Ubuntu.Components 1.0 as Toolkit10
942+// FIXME must merge Page10, Page11 and Page13 files
943 import Ubuntu.Components 1.1 as Toolkit11
944
945 /*! \internal */
946 // Documentation in Page.qdoc
947-Toolkit10.Page {
948+Page10 {
949 id: page
950 /*!
951 \qmlproperty PageHeadConfiguration head
952
953=== modified file 'modules/Ubuntu/Components/PageHeadConfiguration13.qml'
954--- modules/Ubuntu/Components/PageHeadConfiguration13.qml 2015-03-20 12:01:19 +0000
955+++ modules/Ubuntu/Components/PageHeadConfiguration13.qml 2015-05-02 11:10:54 +0000
956@@ -14,7 +14,7 @@
957 * along with this program. If not, see <http://www.gnu.org/licenses/>.
958 */
959
960-import Ubuntu.Components 1.2 as Toolkit12
961+import Ubuntu.Components 1.3 as Toolkit12
962
963 /*!
964 \internal
965
966=== modified file 'modules/Ubuntu/Components/PageHeadSections.qml'
967--- modules/Ubuntu/Components/PageHeadSections.qml 2015-03-03 12:53:42 +0000
968+++ modules/Ubuntu/Components/PageHeadSections.qml 2015-05-02 11:10:54 +0000
969@@ -39,7 +39,7 @@
970 /*!
971 List of strings that represent section names. Example:
972 \qml
973- import Ubuntu.Components 1.2
974+ import Ubuntu.Components 1.3
975 import QtQuick 2.4
976
977 MainView {
978
979=== modified file 'modules/Ubuntu/Components/PageHeadState.qml'
980--- modules/Ubuntu/Components/PageHeadState.qml 2015-03-03 13:47:48 +0000
981+++ modules/Ubuntu/Components/PageHeadState.qml 2015-05-02 11:10:54 +0000
982@@ -15,7 +15,7 @@
983 */
984
985 import QtQuick 2.4
986-import Ubuntu.Components 1.2 // for Action
987+import Ubuntu.Components 1.3 // for Action
988
989 /*!
990 \qmltype PageHeadState
991@@ -29,7 +29,7 @@
992 enables the user to enter search/input mode:
993 \qml
994 import QtQuick 2.4
995- import Ubuntu.Components 1.2
996+ import Ubuntu.Components 1.3
997
998 MainView {
999 id: mainView
1000
1001=== modified file 'modules/Ubuntu/Components/PageStack.qml'
1002--- modules/Ubuntu/Components/PageStack.qml 2015-03-16 21:23:41 +0000
1003+++ modules/Ubuntu/Components/PageStack.qml 2015-05-02 11:10:54 +0000
1004@@ -37,7 +37,7 @@
1005 undefined:
1006 \qml
1007 import QtQuick 2.4
1008- import Ubuntu.Components 1.2
1009+ import Ubuntu.Components 1.3
1010
1011 MainView {
1012 width: units.gu(40)
1013@@ -76,7 +76,7 @@
1014 Example:
1015 \qml
1016 import QtQuick 2.4
1017- import Ubuntu.Components 1.2
1018+ import Ubuntu.Components 1.3
1019 import Ubuntu.Components.ListItems 1.0 as ListItem
1020
1021 MainView {
1022
1023=== modified file 'modules/Ubuntu/Components/Panel.qml'
1024--- modules/Ubuntu/Components/Panel.qml 2015-04-09 09:42:36 +0000
1025+++ modules/Ubuntu/Components/Panel.qml 2015-05-02 11:10:54 +0000
1026@@ -38,7 +38,7 @@
1027 A black panel that can be swiped in from the lower-right of the window can be created like this:
1028 \qml
1029 import QtQuick 2.4
1030- import Ubuntu.Components 1.2
1031+ import Ubuntu.Components 1.3
1032
1033 Item {
1034 width: units.gu(80)
1035@@ -69,7 +69,7 @@
1036 A panel that looks like the standard (bottom-aligned) toolbar, but with custom contents, can be created like this:
1037 \qml
1038 import QtQuick 2.4
1039- import Ubuntu.Components 1.2
1040+ import Ubuntu.Components 1.3
1041
1042 Item {
1043 width: units.gu(80)
1044@@ -106,7 +106,7 @@
1045 signals are forwarded from the panel by calling the child's trigger() function. Example:
1046 \qml
1047 import QtQuick 2.4
1048- import Ubuntu.Components 1.2
1049+ import Ubuntu.Components 1.3
1050
1051 Rectangle {
1052 color: theme.palette.normal.background
1053
1054=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
1055--- modules/Ubuntu/Components/Pickers/DatePicker.qml 2015-04-24 12:00:23 +0000
1056+++ modules/Ubuntu/Components/Pickers/DatePicker.qml 2015-05-02 11:10:54 +0000
1057@@ -36,7 +36,7 @@
1058
1059 \qml
1060 import QtQuick 2.4
1061- import Ubuntu.Components 1.2
1062+ import Ubuntu.Components 1.3
1063 import Ubuntu.Components.Pickers 1.0
1064
1065 Column {
1066@@ -56,7 +56,7 @@
1067 which shows only year and month date units would look as follows:
1068 \qml
1069 import QtQuick 2.4
1070- import Ubuntu.Components 1.2
1071+ import Ubuntu.Components 1.3
1072 import Ubuntu.Components.Pickers 1.0
1073
1074 Column {
1075@@ -75,7 +75,7 @@
1076 The following example demonstrates how to use DatePicker for time picking.
1077 \qml
1078 import QtQuick 2.4
1079- import Ubuntu.Components 1.2
1080+ import Ubuntu.Components 1.3
1081 import Ubuntu.Components.Pickers 1.0
1082
1083 Column {
1084@@ -112,7 +112,7 @@
1085 \endlist
1086 \qml
1087 import QtQuick 2.4
1088- import Ubuntu.Components 1.2
1089+ import Ubuntu.Components 1.3
1090 import Ubuntu.Components.Pickers 1.0
1091
1092 Column {
1093
1094=== modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml'
1095--- modules/Ubuntu/Components/Pickers/DayModel.qml 2015-03-03 13:47:48 +0000
1096+++ modules/Ubuntu/Components/Pickers/DayModel.qml 2015-05-02 11:10:54 +0000
1097@@ -15,7 +15,7 @@
1098 */
1099
1100 import QtQuick 2.4
1101-import Ubuntu.Components 1.2
1102+import Ubuntu.Components 1.3
1103
1104 PickerModelBase {
1105 circular: true
1106
1107=== modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml'
1108--- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml 2015-03-03 13:47:48 +0000
1109+++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml 2015-05-02 11:10:54 +0000
1110@@ -14,7 +14,7 @@
1111 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1112 */
1113 import QtQuick 2.4
1114-import Ubuntu.Components 1.2
1115+import Ubuntu.Components 1.3
1116
1117 /*!
1118 \internal
1119
1120=== modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml'
1121--- modules/Ubuntu/Components/Pickers/HoursModel.qml 2015-03-03 13:47:48 +0000
1122+++ modules/Ubuntu/Components/Pickers/HoursModel.qml 2015-05-02 11:10:54 +0000
1123@@ -15,7 +15,7 @@
1124 */
1125
1126 import QtQuick 2.4
1127-import Ubuntu.Components 1.2
1128+import Ubuntu.Components 1.3
1129
1130 PickerModelBase {
1131 property int from
1132
1133=== modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml'
1134--- modules/Ubuntu/Components/Pickers/MinutesModel.qml 2015-03-03 13:47:48 +0000
1135+++ modules/Ubuntu/Components/Pickers/MinutesModel.qml 2015-05-02 11:10:54 +0000
1136@@ -15,7 +15,7 @@
1137 */
1138
1139 import QtQuick 2.4
1140-import Ubuntu.Components 1.2
1141+import Ubuntu.Components 1.3
1142
1143 PickerModelBase {
1144 property int from
1145
1146=== modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml'
1147--- modules/Ubuntu/Components/Pickers/MonthModel.qml 2015-03-03 13:47:48 +0000
1148+++ modules/Ubuntu/Components/Pickers/MonthModel.qml 2015-05-02 11:10:54 +0000
1149@@ -15,7 +15,7 @@
1150 */
1151
1152 import QtQuick 2.4
1153-import Ubuntu.Components 1.2
1154+import Ubuntu.Components 1.3
1155
1156 PickerModelBase {
1157 circular: (count >= 11)
1158
1159=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
1160--- modules/Ubuntu/Components/Pickers/Picker.qml 2015-04-24 12:00:23 +0000
1161+++ modules/Ubuntu/Components/Pickers/Picker.qml 2015-05-02 11:10:54 +0000
1162@@ -35,7 +35,7 @@
1163 Example:
1164 \qml
1165 import QtQuick 2.4
1166- import Ubuntu.Components 1.2
1167+ import Ubuntu.Components 1.3
1168 import Ubuntu.Components.Pickers 1.0
1169
1170 Picker {
1171
1172=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
1173--- modules/Ubuntu/Components/Pickers/PickerPanel.qml 2015-04-09 09:42:36 +0000
1174+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml 2015-05-02 11:10:54 +0000
1175@@ -33,7 +33,7 @@
1176 on date pickers.
1177 \qml
1178 import QtQuick 2.4
1179- import Ubuntu.Components 1.2
1180+ import Ubuntu.Components 1.3
1181
1182 MainWindow {
1183 width: units.gu(40)
1184
1185=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
1186--- modules/Ubuntu/Components/Pickers/PickerRow.qml 2015-03-03 13:47:48 +0000
1187+++ modules/Ubuntu/Components/Pickers/PickerRow.qml 2015-05-02 11:10:54 +0000
1188@@ -15,7 +15,7 @@
1189 */
1190
1191 import QtQuick 2.4
1192-import Ubuntu.Components 1.2
1193+import Ubuntu.Components 1.3
1194
1195 Row {
1196 id: row
1197
1198=== modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml'
1199--- modules/Ubuntu/Components/Pickers/SecondsModel.qml 2015-03-03 13:47:48 +0000
1200+++ modules/Ubuntu/Components/Pickers/SecondsModel.qml 2015-05-02 11:10:54 +0000
1201@@ -15,7 +15,7 @@
1202 */
1203
1204 import QtQuick 2.4
1205-import Ubuntu.Components 1.2
1206+import Ubuntu.Components 1.3
1207
1208 PickerModelBase {
1209 property int from
1210
1211=== modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml'
1212--- modules/Ubuntu/Components/Pickers/YearModel.qml 2015-03-03 13:47:48 +0000
1213+++ modules/Ubuntu/Components/Pickers/YearModel.qml 2015-05-02 11:10:54 +0000
1214@@ -15,7 +15,7 @@
1215 */
1216
1217 import QtQuick 2.4
1218-import Ubuntu.Components 1.2
1219+import Ubuntu.Components 1.3
1220
1221 PickerModelBase {
1222 // local properties
1223
1224=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
1225--- modules/Ubuntu/Components/Popups/ComposerSheet.qml 2015-03-03 13:47:48 +0000
1226+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml 2015-05-02 11:10:54 +0000
1227@@ -15,7 +15,7 @@
1228 */
1229
1230 import QtQuick 2.4
1231-import Ubuntu.Components 1.2
1232+import Ubuntu.Components 1.3
1233 /*!
1234 \qmltype ComposerSheet
1235 \inherits SheetBase
1236@@ -32,7 +32,7 @@
1237
1238 Example:
1239 \qml
1240- import Ubuntu.Components 1.2
1241+ import Ubuntu.Components 1.3
1242 import Ubuntu.Components.Popups 1.0
1243
1244 Item {
1245
1246=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
1247--- modules/Ubuntu/Components/Popups/DefaultSheet.qml 2015-03-03 13:47:48 +0000
1248+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml 2015-05-02 11:10:54 +0000
1249@@ -15,7 +15,7 @@
1250 */
1251
1252 import QtQuick 2.4
1253-import Ubuntu.Components 1.2
1254+import Ubuntu.Components 1.3
1255
1256 /*!
1257 \qmltype DefaultSheet
1258@@ -33,7 +33,7 @@
1259
1260 Example:
1261 \qml
1262- import Ubuntu.Components 1.2
1263+ import Ubuntu.Components 1.3
1264 import Ubuntu.Components.Popups 1.0
1265
1266 Item {
1267
1268=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
1269--- modules/Ubuntu/Components/Popups/Dialog.qml 2015-04-24 12:00:23 +0000
1270+++ modules/Ubuntu/Components/Popups/Dialog.qml 2015-05-02 11:10:54 +0000
1271@@ -33,7 +33,7 @@
1272 Example:
1273 \qml
1274 import QtQuick 2.4
1275- import Ubuntu.Components 1.2
1276+ import Ubuntu.Components 1.3
1277 import Ubuntu.Components.Popups 1.0
1278
1279 Item {
1280
1281=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
1282--- modules/Ubuntu/Components/Popups/Popover.qml 2015-04-24 12:00:23 +0000
1283+++ modules/Ubuntu/Components/Popups/Popover.qml 2015-05-02 11:10:54 +0000
1284@@ -32,7 +32,7 @@
1285 Example:
1286 \qml
1287 import QtQuick 2.4
1288- import Ubuntu.Components 1.2
1289+ import Ubuntu.Components 1.3
1290 import Ubuntu.Components.ListItems 1.0 as ListItem
1291 import Ubuntu.Components.Popups 1.0
1292
1293
1294=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
1295--- modules/Ubuntu/Components/Popups/PopupBase.qml 2015-03-03 13:47:48 +0000
1296+++ modules/Ubuntu/Components/Popups/PopupBase.qml 2015-05-02 11:10:54 +0000
1297@@ -15,7 +15,7 @@
1298 */
1299
1300 import QtQuick 2.4
1301-import Ubuntu.Components 1.2
1302+import Ubuntu.Components 1.3
1303
1304 /*!
1305 \qmltype PopupBase
1306
1307=== modified file 'modules/Ubuntu/Components/PullToRefresh.qml'
1308--- modules/Ubuntu/Components/PullToRefresh.qml 2015-04-24 12:00:23 +0000
1309+++ modules/Ubuntu/Components/PullToRefresh.qml 2015-05-02 11:10:54 +0000
1310@@ -34,7 +34,7 @@
1311 \qml
1312 import QtQuick 2.4
1313 import QtQuick.XmlListModel 2.0
1314- import Ubuntu.Components 1.2
1315+ import Ubuntu.Components 1.3
1316 import Ubuntu.Components.ListItems 1.0
1317
1318 MainView {
1319@@ -84,7 +84,7 @@
1320 \qml
1321 import QtQuick 2.4
1322 import QtQuick.XmlListModel 2.0
1323- import Ubuntu.Components 1.2
1324+ import Ubuntu.Components 1.3
1325 import Ubuntu.Components.ListItems 1.0
1326
1327 MainView {
1328@@ -132,7 +132,7 @@
1329 \qml
1330 import QtQuick 2.4
1331 import QtQuick.XmlListModel 2.0
1332- import Ubuntu.Components 1.2
1333+ import Ubuntu.Components 1.3
1334 import Ubuntu.Components.ListItems 1.0
1335
1336 MainView {
1337
1338=== modified file 'modules/Ubuntu/Components/Tab.qml'
1339--- modules/Ubuntu/Components/Tab.qml 2015-04-08 16:21:42 +0000
1340+++ modules/Ubuntu/Components/Tab.qml 2015-05-02 11:10:54 +0000
1341@@ -51,7 +51,7 @@
1342 Example:
1343 \qml
1344 import QtQuick 2.4
1345- import Ubuntu.Components 1.2
1346+ import Ubuntu.Components 1.3
1347 MainView {
1348 width: units.gu(40)
1349 height: units.gu(50)
1350
1351=== modified file 'modules/Ubuntu/Components/Tabs.qml'
1352--- modules/Ubuntu/Components/Tabs.qml 2015-03-16 21:23:41 +0000
1353+++ modules/Ubuntu/Components/Tabs.qml 2015-05-02 11:10:54 +0000
1354@@ -31,7 +31,7 @@
1355 Example:
1356 \qml
1357 import QtQuick 2.4
1358- import Ubuntu.Components 1.2
1359+ import Ubuntu.Components 1.3
1360 import Ubuntu.Components.ListItems 1.0 as ListItem
1361
1362 MainView {
1363@@ -102,7 +102,7 @@
1364
1365 \qml
1366 import QtQuick 2.4
1367- import Ubuntu.Components 1.2
1368+ import Ubuntu.Components 1.3
1369
1370 MainView {
1371 id: mainView
1372
1373=== modified file 'modules/Ubuntu/Components/TextField.qml'
1374--- modules/Ubuntu/Components/TextField.qml 2015-04-24 12:00:23 +0000
1375+++ modules/Ubuntu/Components/TextField.qml 2015-05-02 11:10:54 +0000
1376@@ -527,7 +527,7 @@
1377
1378 \qml
1379 import QtQuick 2.4
1380- import Ubuntu.Components 1.2
1381+ import Ubuntu.Components 1.3
1382 TextField{
1383 validator: IntValidator{bottom: 11; top: 31;}
1384 focus: true
1385
1386=== added file 'modules/Ubuntu/Components/Themes/1.2/1.2.pro'
1387--- modules/Ubuntu/Components/Themes/1.2/1.2.pro 1970-01-01 00:00:00 +0000
1388+++ modules/Ubuntu/Components/Themes/1.2/1.2.pro 2015-05-02 11:10:54 +0000
1389@@ -0,0 +1,16 @@
1390+TEMPLATE=aux
1391+
1392+CONFIG+=ubuntu_qml_module
1393+
1394+uri = Ubuntu.Components.Themes
1395+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
1396+
1397+message(Theme install path $$installPath)
1398+
1399+QML_FILES = *.qml
1400+
1401+qml_files.installPath = $$installPath
1402+qml_files.files = $$QML_FILES
1403+
1404+UBUNTU_QML_MODULE_FILES += qml_files
1405+
1406
1407=== added file 'modules/Ubuntu/Components/Themes/1.3/1.3.pro'
1408--- modules/Ubuntu/Components/Themes/1.3/1.3.pro 1970-01-01 00:00:00 +0000
1409+++ modules/Ubuntu/Components/Themes/1.3/1.3.pro 2015-05-02 11:10:54 +0000
1410@@ -0,0 +1,14 @@
1411+TEMPLATE=aux
1412+
1413+CONFIG+=ubuntu_qml_module
1414+
1415+uri = Ubuntu.Components.Themes
1416+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.3
1417+
1418+QML_FILES = *.qml
1419+
1420+qml_files.installPath = $$installPath
1421+qml_files.files = $$QML_FILES
1422+
1423+UBUNTU_QML_MODULE_FILES += qml_files
1424+
1425
1426=== added file 'modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro'
1427--- modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro 1970-01-01 00:00:00 +0000
1428+++ modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro 2015-05-02 11:10:54 +0000
1429@@ -0,0 +1,14 @@
1430+TEMPLATE=aux
1431+
1432+CONFIG+=ubuntu_qml_module
1433+
1434+uri = Ubuntu.Components.Themes.Ambiance
1435+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
1436+
1437+QML_FILES = *.qml
1438+
1439+qml_files.installPath = $$installPath
1440+qml_files.files = $$QML_FILES
1441+
1442+UBUNTU_QML_MODULE_FILES += qml_files
1443+
1444
1445=== added file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro'
1446--- modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro 1970-01-01 00:00:00 +0000
1447+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro 2015-05-02 11:10:54 +0000
1448@@ -0,0 +1,14 @@
1449+TEMPLATE=aux
1450+
1451+CONFIG+=ubuntu_qml_module
1452+
1453+uri = Ubuntu.Components.Themes.Ambiance
1454+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.3
1455+
1456+QML_FILES = *.qml
1457+
1458+qml_files.installPath = $$installPath
1459+qml_files.files = $$QML_FILES
1460+
1461+UBUNTU_QML_MODULE_FILES += qml_files
1462+
1463
1464=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml'
1465--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml 2015-04-24 14:07:02 +0000
1466+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml 2015-05-02 11:10:54 +0000
1467@@ -15,7 +15,7 @@
1468 */
1469
1470 import QtQuick 2.4
1471-import Ubuntu.Components 1.2
1472+import Ubuntu.Components 1.3
1473
1474 Image {
1475 id: container
1476
1477=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml'
1478--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml 2015-04-24 14:07:02 +0000
1479+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml 2015-05-02 11:10:54 +0000
1480@@ -17,7 +17,7 @@
1481 */
1482
1483 import QtQuick 2.4
1484-import Ubuntu.Components 1.2
1485+import Ubuntu.Components 1.3
1486
1487 Item {
1488 id: buttonForeground
1489
1490=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml'
1491--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml 2015-04-24 14:07:02 +0000
1492+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml 2015-05-02 11:10:54 +0000
1493@@ -17,7 +17,7 @@
1494 */
1495
1496 import QtQuick 2.4
1497-import Ubuntu.Components 1.2
1498+import Ubuntu.Components 1.3
1499
1500 Item {
1501 id: buttonStyle
1502
1503=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml'
1504--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml 2015-04-24 14:07:02 +0000
1505+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml 2015-05-02 11:10:54 +0000
1506@@ -15,7 +15,7 @@
1507 */
1508
1509 import QtQuick 2.4
1510-import Ubuntu.Components 1.2
1511+import Ubuntu.Components 1.3
1512 import Ubuntu.Components.Styles 1.2 as Style
1513
1514 Style.ComboButtonStyle {
1515
1516=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml'
1517--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml 2015-04-24 14:07:02 +0000
1518+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml 2015-05-02 11:10:54 +0000
1519@@ -15,7 +15,7 @@
1520 */
1521
1522 import QtQuick 2.4
1523-import Ubuntu.Components 1.2
1524+import Ubuntu.Components 1.3
1525 import Ubuntu.Components.ListItems 1.0
1526
1527 Item {
1528
1529=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml'
1530--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml 2015-04-24 14:07:02 +0000
1531+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml 2015-05-02 11:10:54 +0000
1532@@ -15,7 +15,7 @@
1533 */
1534
1535 import QtQuick 2.4
1536-import Ubuntu.Components 1.2
1537+import Ubuntu.Components 1.3
1538 import QtGraphicalEffects 1.0
1539
1540 // FIXME: Replace this once UbuntuShape support for gradients and shading has landed
1541
1542=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml'
1543--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml 2015-04-24 14:07:02 +0000
1544+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml 2015-05-02 11:10:54 +0000
1545@@ -15,7 +15,7 @@
1546 */
1547
1548 import QtQuick 2.4
1549-import Ubuntu.Components 1.2
1550+import Ubuntu.Components 1.3
1551
1552 Item {
1553 id: dialogForegroundStyle
1554
1555=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml'
1556--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml 2015-04-24 14:07:02 +0000
1557+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml 2015-05-02 11:10:54 +0000
1558@@ -16,7 +16,7 @@
1559 */
1560
1561 import QtQuick 2.4
1562-import Ubuntu.Components 1.2
1563+import Ubuntu.Components 1.3
1564
1565 Item {
1566 id: ambianceStyle
1567
1568=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml'
1569--- modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml 2015-04-24 14:07:02 +0000
1570+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml 2015-05-02 11:10:54 +0000
1571@@ -14,7 +14,7 @@
1572 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1573 */
1574 import QtQuick 2.4
1575-import Ubuntu.Components 1.2
1576+import Ubuntu.Components 1.3
1577
1578 Item {
1579 // styling properties
1580
1581=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml'
1582--- modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml 2015-04-24 14:07:02 +0000
1583+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml 2015-05-02 11:10:54 +0000
1584@@ -16,7 +16,7 @@
1585 */
1586
1587 import QtQuick 2.4
1588-import Ubuntu.Components 1.2
1589+import Ubuntu.Components 1.3
1590
1591 Item {
1592 id: ambianceStyle
1593
1594=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
1595--- modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml 2015-04-24 14:34:39 +0000
1596+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml 2015-05-02 11:10:54 +0000
1597@@ -15,7 +15,7 @@
1598 */
1599
1600 import QtQuick 2.4
1601-import Ubuntu.Components 1.2
1602+import Ubuntu.Components 1.3
1603 import Ubuntu.Components.Themes 1.3
1604
1605 Palette {
1606@@ -34,7 +34,7 @@
1607 selected {
1608 background: Qt.rgba(0, 0, 0, 0.05)
1609 backgroundText: UbuntuColors.darkGrey
1610- selection: selected.foreground // unused
1611+ selection: selected.foreground
1612 foreground: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
1613 foregroundText: UbuntuColors.darkGrey
1614 field: "#FFFFFF"
1615
1616=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml'
1617--- modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml 2015-04-24 14:07:02 +0000
1618+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml 2015-05-02 11:10:54 +0000
1619@@ -15,7 +15,7 @@
1620 */
1621
1622 import QtQuick 2.4
1623-import Ubuntu.Components 1.2
1624+import Ubuntu.Components 1.3
1625
1626 Item {
1627 property real minFade: 0.2
1628
1629=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml'
1630--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml 2015-04-24 14:07:02 +0000
1631+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml 2015-05-02 11:10:54 +0000
1632@@ -15,7 +15,7 @@
1633 */
1634
1635 import QtQuick 2.4
1636-import Ubuntu.Components 1.2
1637+import Ubuntu.Components 1.3
1638
1639 Item {
1640 id: progressionVisualStyle
1641
1642=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml'
1643--- modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml 2015-04-24 14:07:02 +0000
1644+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml 2015-05-02 11:10:54 +0000
1645@@ -15,7 +15,7 @@
1646 */
1647
1648 import QtQuick 2.4
1649-import Ubuntu.Components 1.2
1650+import Ubuntu.Components 1.3
1651 import Ubuntu.Components.Styles 1.2 as Style
1652
1653 Style.PullToRefreshStyle {
1654
1655=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml'
1656--- modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml 2015-04-24 14:07:02 +0000
1657+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml 2015-05-02 11:10:54 +0000
1658@@ -15,7 +15,7 @@
1659 */
1660
1661 import QtQuick 2.4
1662-import Ubuntu.Components 1.2
1663+import Ubuntu.Components 1.3
1664
1665 Item {
1666 id: visuals
1667
1668=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml'
1669--- modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml 2015-04-24 14:07:02 +0000
1670+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml 2015-05-02 11:10:54 +0000
1671@@ -15,7 +15,7 @@
1672 */
1673
1674 import QtQuick 2.4
1675-import Ubuntu.Components 1.2
1676+import Ubuntu.Components 1.3
1677
1678 // FIXME : move the API into Ubuntu.Components.Style
1679 Item {
1680
1681=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml'
1682--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml 2015-04-24 14:07:02 +0000
1683+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml 2015-05-02 11:10:54 +0000
1684@@ -15,7 +15,7 @@
1685 */
1686
1687 import QtQuick 2.4
1688-import Ubuntu.Components 1.2
1689+import Ubuntu.Components 1.3
1690
1691 Item {
1692 id: visuals
1693
1694=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
1695--- modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro 2015-04-24 14:43:08 +0000
1696+++ modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro 2015-05-02 11:10:54 +0000
1697@@ -1,23 +1,5 @@
1698-TEMPLATE = aux
1699-
1700-CONFIG+=ubuntu_qml_module
1701-
1702-uri = Ubuntu.Components.Themes.Ambiance
1703-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1704-
1705-QMLDIR_FILE = qmldir
1706-QML_FILES = ./1.2/*.qml ./1.3/*.qml
1707-ARTWORK_FILES += artwork/*.png \
1708- artwork/*.svg \
1709- artwork/*.sci
1710-
1711-qmldir_file.installPath = $$installPath
1712-qmldir_file.files = $$QMLDIR_FILE
1713-
1714-qml_files.installPath = $$installPath
1715-qml_files.files = $$QML_FILES
1716-
1717-artwork_files.installPath = $$installPath/artwork
1718-artwork_files.files = $$ARTWORK_FILES
1719-
1720-UBUNTU_QML_MODULE_FILES += qmldir_file qml_files artwork_files
1721+TEMPLATE = subdirs
1722+
1723+SUBDIRS += 1.2 \
1724+ 1.3 \
1725+ AmbianceModule.pro
1726
1727=== added file 'modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro'
1728--- modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro 1970-01-01 00:00:00 +0000
1729+++ modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro 2015-05-02 11:10:54 +0000
1730@@ -0,0 +1,20 @@
1731+TEMPLATE = aux
1732+
1733+CONFIG+=ubuntu_qml_module
1734+
1735+uri = Ubuntu.Components.Themes.Ambiance
1736+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1737+
1738+QMLDIR_FILE = qmldir
1739+ARTWORK_FILES += artwork/*.png \
1740+ artwork/*.svg \
1741+ artwork/*.sci
1742+
1743+qmldir_file.installPath = $$installPath
1744+qmldir_file.files = $$QMLDIR_FILE
1745+
1746+artwork_files.installPath = $$installPath/artwork
1747+artwork_files.files = $$ARTWORK_FILES
1748+
1749+UBUNTU_QML_MODULE_FILES += qmldir_file artwork_files
1750+
1751
1752=== added file 'modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro'
1753--- modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro 1970-01-01 00:00:00 +0000
1754+++ modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro 2015-05-02 11:10:54 +0000
1755@@ -0,0 +1,14 @@
1756+TEMPLATE=aux
1757+
1758+CONFIG+=ubuntu_qml_module
1759+
1760+uri = Ubuntu.Components.Themes.SuruDark
1761+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
1762+
1763+QML_FILES = *.qml
1764+
1765+qml_files.installPath = $$installPath
1766+qml_files.files = $$QML_FILES
1767+
1768+UBUNTU_QML_MODULE_FILES += qml_files
1769+
1770
1771=== added file 'modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro'
1772--- modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro 1970-01-01 00:00:00 +0000
1773+++ modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro 2015-05-02 11:10:54 +0000
1774@@ -0,0 +1,14 @@
1775+TEMPLATE=aux
1776+
1777+CONFIG+=ubuntu_qml_module
1778+
1779+uri = Ubuntu.Components.Themes.SuruDark
1780+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.3
1781+
1782+QML_FILES = *.qml
1783+
1784+qml_files.installPath = $$installPath
1785+qml_files.files = $$QML_FILES
1786+
1787+UBUNTU_QML_MODULE_FILES += qml_files
1788+
1789
1790=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro'
1791--- modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro 2015-04-24 14:48:00 +0000
1792+++ modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro 2015-05-02 11:10:54 +0000
1793@@ -1,27 +1,30 @@
1794-TEMPLATE = aux
1795-CONFIG+=ubuntu_qml_module
1796-
1797-uri = Ubuntu.Components.Themes.SuruDark
1798-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1799-
1800-PARENT_THEME_FILE = parent_theme
1801-QMLDIR_FILE = qmldir
1802-QML_FILES = ./1.2/*.qml ./1.3/*.qml
1803-ARTWORK_FILES += artwork/*.png \
1804- artwork/*.svg \
1805- artwork/*.sci
1806-
1807-parent_theme_file.installPath = $$installPath
1808-parent_theme_file.files = $$PARENT_THEME_FILE
1809-
1810-qmldir_file.installPath = $$installPath
1811-qmldir_file.files = $$QMLDIR_FILE
1812-
1813-qml_files.installPath = $$installPath
1814-qml_files.files = $$QML_FILES
1815-
1816-artwork_files.installPath = $$installPath/artwork
1817-artwork_files.files = $$ARTWORK_FILES
1818-
1819-
1820-UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file qml_files artwork_files
1821+TEMPLATE = subdirs
1822+
1823+SUBDIRS += 1.2 \
1824+ 1.3 \
1825+ SuruDarkModule.pro
1826+
1827+#uri = Ubuntu.Components.Themes.SuruDark
1828+#installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1829+
1830+#PARENT_THEME_FILE = parent_theme
1831+#QMLDIR_FILE = qmldir
1832+#QML_FILES = ./1.2/*.qml ./1.3/*.qml
1833+#ARTWORK_FILES += artwork/*.png \
1834+# artwork/*.svg \
1835+# artwork/*.sci
1836+
1837+#parent_theme_file.installPath = $$installPath
1838+#parent_theme_file.files = $$PARENT_THEME_FILE
1839+
1840+#qmldir_file.installPath = $$installPath
1841+#qmldir_file.files = $$QMLDIR_FILE
1842+
1843+#qml_files.installPath = $$installPath
1844+#qml_files.files = $$QML_FILES
1845+
1846+#artwork_files.installPath = $$installPath/artwork
1847+#artwork_files.files = $$ARTWORK_FILES
1848+
1849+
1850+#UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file qml_files artwork_files
1851
1852=== added file 'modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro'
1853--- modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro 1970-01-01 00:00:00 +0000
1854+++ modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro 2015-05-02 11:10:54 +0000
1855@@ -0,0 +1,22 @@
1856+TEMPLATE = aux
1857+CONFIG+=ubuntu_qml_module
1858+
1859+uri = Ubuntu.Components.Themes.SuruDark
1860+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1861+
1862+PARENT_THEME_FILE = parent_theme
1863+QMLDIR_FILE = qmldir
1864+ARTWORK_FILES += artwork/*.png \
1865+ artwork/*.svg \
1866+ artwork/*.sci
1867+
1868+parent_theme_file.installPath = $$installPath
1869+parent_theme_file.files = $$PARENT_THEME_FILE
1870+
1871+qmldir_file.installPath = $$installPath
1872+qmldir_file.files = $$QMLDIR_FILE
1873+
1874+artwork_files.installPath = $$installPath/artwork
1875+artwork_files.files = $$ARTWORK_FILES
1876+
1877+UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file artwork_files
1878
1879=== modified file 'modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro'
1880--- modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro 2014-11-26 08:35:25 +0000
1881+++ modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro 2015-05-02 11:10:54 +0000
1882@@ -5,6 +5,7 @@
1883 installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1884
1885 PARENT_THEME_FILE = parent_theme
1886+DEPRECATED_FILE = deprecated
1887 QMLDIR_FILE = qmldir
1888 QML_FILES = *.qml
1889 ARTWORK_FILES += artwork/*.png \
1890@@ -14,6 +15,9 @@
1891 parent_theme_file.installPath = $$installPath
1892 parent_theme_file.files = $$PARENT_THEME_FILE
1893
1894+deprecated_file.installPath = $$installPath
1895+deprecated_file.files = $$DEPRECATED_FILE
1896+
1897 qmldir_file.installPath = $$installPath
1898 qmldir_file.files = $$QMLDIR_FILE
1899
1900@@ -24,4 +28,4 @@
1901 artwork_files.files = $$ARTWORK_FILES
1902
1903
1904-UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file qml_files artwork_files
1905+UBUNTU_QML_MODULE_FILES += parent_theme_file deprecated_file qmldir_file qml_files artwork_files
1906
1907=== added file 'modules/Ubuntu/Components/Themes/SuruGradient/deprecated'
1908=== modified file 'modules/Ubuntu/Components/Themes/Themes.pro'
1909--- modules/Ubuntu/Components/Themes/Themes.pro 2014-11-24 10:39:15 +0000
1910+++ modules/Ubuntu/Components/Themes/Themes.pro 2015-05-02 11:10:54 +0000
1911@@ -1,5 +1,8 @@
1912 TEMPLATE = subdirs
1913 SUBDIRS += ThemesModule.pro \
1914+ 1.2 \
1915+ 1.3 \
1916 Ambiance \
1917 SuruDark \
1918+ #deprecated, but we keep for compatibility
1919 SuruGradient
1920
1921=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
1922--- modules/Ubuntu/Components/ToolbarButton.qml 2015-04-24 14:07:02 +0000
1923+++ modules/Ubuntu/Components/ToolbarButton.qml 2015-05-02 11:10:54 +0000
1924@@ -29,7 +29,7 @@
1925 Example of different ways to define the toolbar button:
1926 \qml
1927 import QtQuick 2.4
1928- import Ubuntu.Components 1.2
1929+ import Ubuntu.Components 1.3
1930
1931 MainView {
1932 width: units.gu(50)
1933
1934=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
1935--- modules/Ubuntu/Components/ToolbarItems.qml 2015-03-05 09:35:06 +0000
1936+++ modules/Ubuntu/Components/ToolbarItems.qml 2015-05-02 11:10:54 +0000
1937@@ -39,7 +39,7 @@
1938 be visible to the user:
1939 \qml
1940 import QtQuick 2.4
1941- import Ubuntu.Components 1.2
1942+ import Ubuntu.Components 1.3
1943
1944 MainView {
1945 width: units.gu(50)
1946@@ -71,7 +71,7 @@
1947 the full height of the toolbar, and other Items you will probably want to center vertically:
1948 \qml
1949 import QtQuick 2.4
1950- import Ubuntu.Components 1.2
1951+ import Ubuntu.Components 1.3
1952
1953 MainView {
1954 width: units.gu(50)
1955@@ -120,7 +120,7 @@
1956 visible in the toolbar, instead of the default toolbar-styled back button:
1957 \qml
1958 import QtQuick 2.4
1959- import Ubuntu.Components 1.2
1960+ import Ubuntu.Components 1.3
1961
1962 MainView {
1963 width: units.gu(50)
1964
1965=== modified file 'modules/Ubuntu/Components/UbuntuListView.qml'
1966--- modules/Ubuntu/Components/UbuntuListView.qml 2015-03-03 13:47:48 +0000
1967+++ modules/Ubuntu/Components/UbuntuListView.qml 2015-05-02 11:10:54 +0000
1968@@ -15,7 +15,7 @@
1969 */
1970
1971 import QtQuick 2.4
1972-import Ubuntu.Components 1.2 as Toolkit
1973+import Ubuntu.Components 1.3 as Toolkit
1974
1975 /*!
1976 \qmltype UbuntuListView
1977@@ -30,7 +30,7 @@
1978
1979 Examples:
1980 \qml
1981- import Ubuntu.Components 1.2
1982+ import Ubuntu.Components 1.3
1983 import Ubuntu.Components.ListItems 1.0 as ListItem
1984
1985 Item {
1986
1987=== modified file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml'
1988--- modules/Ubuntu/Components/UbuntuNumberAnimation.qml 2015-03-03 13:47:48 +0000
1989+++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml 2015-05-02 11:10:54 +0000
1990@@ -16,7 +16,7 @@
1991 */
1992
1993 import QtQuick 2.4
1994-import Ubuntu.Components 1.2
1995+import Ubuntu.Components 1.3
1996
1997 /*!
1998 \qmltype UbuntuNumberAnimation
1999@@ -29,7 +29,7 @@
2000
2001 \qml
2002 import QtQuick 2.4
2003- import Ubuntu.Components 1.2
2004+ import Ubuntu.Components 1.3
2005
2006 Rectangle {
2007 width: 100; height: 100
2008
2009=== modified file 'modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp'
2010--- modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp 2015-03-23 16:28:35 +0000
2011+++ modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp 2015-05-02 11:10:54 +0000
2012@@ -39,7 +39,7 @@
2013 m_settings(SETTINGS_FILE_FORMAT.arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)), QSettings::IniFormat)
2014 {
2015 // fundamental features rely on the default theme, so bail out if it's absent
2016- if (pathFromThemeName(DEFAULT_THEME).isEmpty()) {
2017+ if (!pathFromThemeName(DEFAULT_THEME).isValid()) {
2018 qWarning() << "Mandatory default theme" << DEFAULT_THEME << "missing!";
2019 }
2020
2021
2022=== modified file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
2023--- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp 2015-04-24 15:16:34 +0000
2024+++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp 2015-05-02 11:10:54 +0000
2025@@ -119,7 +119,7 @@
2026 QQmlComponent* UCDeprecatedTheme::createStyleComponent(const QString& styleName, QObject* parent)
2027 {
2028 showDeprecatedNote(parent, "Theme.createStyleComponent() is deprecated. Use ThemeSettings instead.");
2029- return UCTheme::defaultTheme().createStyleComponent(styleName, parent);
2030+ return UCTheme::defaultTheme().createStyleComponent(styleName, parent, BUILD_VERSION(1, 2));
2031 }
2032
2033 void UCDeprecatedTheme::registerToContext(QQmlContext* context)
2034
2035=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
2036--- modules/Ubuntu/Components/plugin/uctheme.cpp 2015-04-25 05:10:08 +0000
2037+++ modules/Ubuntu/Components/plugin/uctheme.cpp 2015-05-02 11:10:54 +0000
2038@@ -142,7 +142,8 @@
2039 const QString THEME_FOLDER_FORMAT("%1/%2/");
2040 const QString PARENT_THEME_FILE("parent_theme");
2041
2042-QStringList themeSearchPath() {
2043+QStringList themeSearchPath()
2044+{
2045 QString envPath = QLatin1String(getenv("UBUNTU_UI_TOOLKIT_THEMES_PATH"));
2046 QStringList pathList = envPath.split(':', QString::SkipEmptyParts);
2047 if (pathList.isEmpty()) {
2048@@ -162,7 +163,6 @@
2049 pathList << qml2ImportPath.split(':', QString::SkipEmptyParts);
2050 }
2051 pathList << QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath).split(':', QString::SkipEmptyParts);
2052-
2053 // fix folders
2054 QStringList result;
2055 Q_FOREACH(const QString &path, pathList) {
2056@@ -175,8 +175,10 @@
2057 return result;
2058 }
2059
2060-QUrl pathFromThemeName(QString themeName)
2061+UCTheme::ThemeRecord pathFromThemeName(QString themeName)
2062 {
2063+ // the first entry from pathList is the app's current folder
2064+ UCTheme::ThemeRecord record(themeName, QUrl(), false, false);
2065 themeName.replace('.', '/');
2066 QStringList pathList = themeSearchPath();
2067 Q_FOREACH(const QString &path, pathList) {
2068@@ -184,20 +186,22 @@
2069 // QUrl needs a trailing slash to understand it's a directory
2070 QString absoluteThemeFolder = QDir(themeFolder).absolutePath().append('/');
2071 if (QDir(absoluteThemeFolder).exists()) {
2072- return QUrl::fromLocalFile(absoluteThemeFolder);
2073+ record.deprecated = QFile::exists(absoluteThemeFolder + "deprecated");
2074+ record.shared = QFile::exists(absoluteThemeFolder + "qmldir");
2075+ record.path = QUrl::fromLocalFile(absoluteThemeFolder);
2076+ break;
2077 }
2078 }
2079- return QUrl();
2080+ return record;
2081 }
2082
2083-QString parentThemeName(const QString& themeName)
2084+QString parentThemeName(const UCTheme::ThemeRecord& themePath)
2085 {
2086 QString parentTheme;
2087- QUrl themePath = pathFromThemeName(themeName);
2088 if (!themePath.isValid()) {
2089- qWarning() << qPrintable(UbuntuI18n::instance().tr("Theme not found: \"%1\"").arg(themeName));
2090+ qWarning() << qPrintable(UbuntuI18n::instance().tr("Theme not found: \"%1\"").arg(themePath.name));
2091 } else {
2092- QFile file(themePath.resolved(PARENT_THEME_FILE).toLocalFile());
2093+ QFile file(themePath.path.resolved(PARENT_THEME_FILE).toLocalFile());
2094 if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
2095 QTextStream in(&file);
2096 parentTheme = in.readLine();
2097@@ -400,11 +404,11 @@
2098
2099 QString themeName = name();
2100 while (!themeName.isEmpty()) {
2101- QUrl themePath = pathFromThemeName(themeName);
2102+ ThemeRecord themePath = pathFromThemeName(themeName);
2103 if (themePath.isValid()) {
2104 m_themePaths.append(themePath);
2105 }
2106- themeName = parentThemeName(themeName);
2107+ themeName = parentThemeName(themePath);
2108 }
2109 }
2110
2111@@ -549,24 +553,46 @@
2112 setPalette(NULL);
2113 }
2114
2115-QUrl UCTheme::styleUrl(const QString& styleName, quint16 version)
2116+QUrl UCTheme::styleUrl(const QString& styleName, quint16 version, bool *isFallback)
2117 {
2118- Q_FOREACH (const QUrl& themePath, m_themePaths) {
2119- // check versioned style first
2120+ if (isFallback) {
2121+ (*isFallback) = false;
2122+ }
2123+ Q_FOREACH (const ThemeRecord &themePath, m_themePaths) {
2124 QUrl styleUrl;
2125+ /*
2126+ * There are two cases where we have to deal with non-versioned styles: application
2127+ * themes made for the previous theming and deprecated themes. For shared themes,
2128+ * we have to check the fallback case.
2129+ */
2130+ quint16 styleVersion = version;
2131+ if (themePath.deprecated) {
2132+ styleVersion = 0;
2133+ }
2134+ if (themePath.shared && (version < BUILD_VERSION(1, 2))) {
2135+ styleVersion = LATEST_UITK_VERSION;
2136+ }
2137+
2138+ // loop through the versions to see if we have one matching
2139 // we stop at version 1.2 as we do not have support for earlier themes anymore.
2140- for (int minor = MINOR_VERSION(version); minor >= 2; minor--) {
2141- QString versionedName = QStringLiteral("%1.%2/%3").arg(MAJOR_VERSION(version)).arg(minor).arg(styleName);
2142- styleUrl = themePath.resolved(versionedName);
2143+ for (int minor = MINOR_VERSION(styleVersion); minor >= 2; minor--) {
2144+ QString versionedName = QStringLiteral("%1.%2/%3").arg(MAJOR_VERSION(styleVersion)).arg(minor).arg(styleName);
2145+ styleUrl = themePath.path.resolved(versionedName);
2146 if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
2147+ // set fallback warning if the theme is shared
2148+ if (isFallback && themePath.shared && (version != styleVersion)) {
2149+ (*isFallback) = true;
2150+ }
2151 return styleUrl;
2152 }
2153 }
2154
2155- // fall back to the old one
2156- styleUrl = themePath.resolved(styleName);
2157- if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
2158- return styleUrl;
2159+ // if we don't get any style, get the non-versioned ones for non-shared and deprecated styles
2160+ if (!themePath.shared || themePath.deprecated) {
2161+ styleUrl = themePath.path.resolved(styleName);
2162+ if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
2163+ return styleUrl;
2164+ }
2165 }
2166 }
2167
2168@@ -642,8 +668,14 @@
2169 }
2170 // make sure we have the paths
2171 if (engine != NULL) {
2172- QUrl url = styleUrl(styleName, version);
2173+ bool fallback = false;
2174+ QUrl url = styleUrl(styleName, version, &fallback);
2175 if (url.isValid()) {
2176+ if (fallback) {
2177+ qmlInfo(parent) << QStringLiteral("Theme '%1' has no '%2' style for version %3.%4, fall back to version %5.%6.")
2178+ .arg(name()).arg(styleName).arg(MAJOR_VERSION(version)).arg(MINOR_VERSION(version))
2179+ .arg(MAJOR_VERSION(LATEST_UITK_VERSION)).arg(MINOR_VERSION(LATEST_UITK_VERSION));
2180+ }
2181 component = new QQmlComponent(engine, url, QQmlComponent::PreferSynchronous, parent);
2182 if (component->isError()) {
2183 qmlInfo(parent) << component->errorString();
2184
2185=== modified file 'modules/Ubuntu/Components/plugin/uctheme.h'
2186--- modules/Ubuntu/Components/plugin/uctheme.h 2015-04-24 15:16:34 +0000
2187+++ modules/Ubuntu/Components/plugin/uctheme.h 2015-05-02 11:10:54 +0000
2188@@ -41,6 +41,24 @@
2189 Q_PROPERTY(QObject* palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL)
2190 Q_PROPERTY(quint16 version MEMBER m_version WRITE setVersion NOTIFY versionChanged FINAL)
2191 public:
2192+ struct ThemeRecord {
2193+ ThemeRecord() :
2194+ shared(false), deprecated(false)
2195+ {}
2196+ ThemeRecord(const QString &name, const QUrl &path, bool shared, bool deprecated) :
2197+ name(name), path(path), shared(shared), deprecated(deprecated)
2198+ {}
2199+ bool isValid() const
2200+ {
2201+ return path.isValid();
2202+ }
2203+
2204+ QString name;
2205+ QUrl path;
2206+ bool shared:1;
2207+ bool deprecated:1;
2208+ };
2209+
2210 explicit UCTheme(QObject *parent = 0);
2211 static UCTheme &defaultTheme()
2212 {
2213@@ -87,7 +105,7 @@
2214 void init();
2215 void updateEnginePaths();
2216 void updateThemePaths();
2217- QUrl styleUrl(const QString& styleName, quint16 version);
2218+ QUrl styleUrl(const QString& styleName, quint16 version, bool *isFallback = NULL);
2219 void loadPalette(bool notify = true);
2220
2221 class PaletteConfig
2222@@ -138,7 +156,7 @@
2223 QPointer<QObject> m_palette; // the palette might be from the default style if the theme doesn't define palette
2224 QQmlEngine *m_engine;
2225 PaletteConfig m_config;
2226- QList<QUrl> m_themePaths;
2227+ QList<ThemeRecord> m_themePaths;
2228 UCDefaultTheme m_defaultTheme;
2229 quint16 m_version;
2230 bool m_defaultStyle:1;
2231@@ -147,6 +165,6 @@
2232 friend class UCDeprecatedTheme;
2233 };
2234
2235-QUrl pathFromThemeName(QString themeName);
2236+UCTheme::ThemeRecord pathFromThemeName(QString themeName);
2237
2238 #endif // UCTHEME_H
2239
2240=== modified file 'modules/Ubuntu/Components/qmldir'
2241--- modules/Ubuntu/Components/qmldir 2015-04-10 06:52:20 +0000
2242+++ modules/Ubuntu/Components/qmldir 2015-05-02 11:10:54 +0000
2243@@ -94,7 +94,6 @@
2244 CrossFadeImage 1.1 CrossFadeImage11.qml
2245 PullToRefresh 1.1 PullToRefresh.qml
2246 UbuntuListView 1.1 UbuntuListView11.qml
2247-internal PageBase Page10.qml
2248 Page 1.1 Page11.qml
2249 PageHeadConfiguration 1.1 PageHeadConfiguration11.qml
2250 PageHeadSections 1.1 PageHeadSections.qml
2251
2252=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py'
2253--- tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py 2015-04-14 21:02:06 +0000
2254+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py 2015-05-02 11:10:54 +0000
2255@@ -87,7 +87,7 @@
2256 def _get_path_to_gallery_source(self):
2257 return os.path.join(
2258 ubuntuuitoolkit.tests.get_path_to_source_root(), 'examples',
2259- 'ubuntu-ui-toolkit-gallery')
2260+ '1.3', 'ubuntu-ui-toolkit-gallery')
2261
2262 def _application_source_exists(self):
2263 return 'UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE' in os.environ
2264@@ -98,7 +98,8 @@
2265 'ubuntu-ui-toolkit-gallery.qml')
2266
2267 def _get_path_to_installed_gallery(self):
2268- return '/usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery'
2269+ return '/usr/lib/ubuntu-ui-toolkit/examples/'
2270+ '1.3/ubuntu-ui-toolkit-gallery'
2271
2272 def _get_desktop_file_path(self):
2273 desktop_file_path = os.path.join(
2274
2275=== added file 'tests/unit/tst_components/demo_image.jpg'
2276Binary files tests/unit/tst_components/demo_image.jpg 1970-01-01 00:00:00 +0000 and tests/unit/tst_components/demo_image.jpg 2015-05-02 11:10:54 +0000 differ
2277=== added file 'tests/unit/tst_components/map_icon.png'
2278Binary files tests/unit/tst_components/map_icon.png 1970-01-01 00:00:00 +0000 and tests/unit/tst_components/map_icon.png 2015-05-02 11:10:54 +0000 differ
2279=== modified file 'tests/unit/tst_components/tst_CrossFadeImage.qml'
2280--- tests/unit/tst_components/tst_CrossFadeImage.qml 2015-03-03 13:20:06 +0000
2281+++ tests/unit/tst_components/tst_CrossFadeImage.qml 2015-05-02 11:10:54 +0000
2282@@ -41,7 +41,7 @@
2283 width: 123
2284 height: 321
2285 }
2286- source: Qt.resolvedUrl("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg")
2287+ source: Qt.resolvedUrl("demo_image.jpg")
2288 }
2289
2290 function loadImage(url) {
2291@@ -91,8 +91,8 @@
2292
2293 function test_fade(data) {
2294 crossFadeImage.fadeStyle = data.style;
2295- loadImage("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg");
2296- loadImage("../../../examples/ubuntu-ui-toolkit-gallery/map_icon.png");
2297+ loadImage("demo_image.jpg");
2298+ loadImage("map_icon.png");
2299 waitForAnimation();
2300 cleanupTest();
2301 }
2302@@ -107,8 +107,8 @@
2303 function test_fadeDuration(data) {
2304 crossFadeImage.fadeStyle = data.style;
2305 fadeDuration = UbuntuAnimation.SleepyDuration;
2306- loadImage("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg");
2307- loadImage("../../../examples/ubuntu-ui-toolkit-gallery/map_icon.png");
2308+ loadImage("demo_image.jpg");
2309+ loadImage("map_icon.png");
2310 sleep(UbuntuAnimation.SleepyDuration / 2); // < fadeDuration
2311 compare(running, true, "Animation stopped before 1000 ms");
2312 waitForAnimation();
2313@@ -116,7 +116,7 @@
2314 }
2315
2316 function test_sourceSize() {
2317- loadImage("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg");
2318+ loadImage("demo_image.jpg");
2319 compare(crossFadeImage.sourceSize.width, 640, "Source width incorrectly initialized.");
2320 compare(crossFadeImage.sourceSize.height, 427, "Source height incorrectly initialized.");
2321 crossFadeImage.sourceSize.width = 100;
2322
2323=== added directory 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/1.2'
2324=== renamed file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/TestStyle.qml' => 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/1.2/TestStyle.qml'
2325=== removed file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme'
2326--- tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme 2013-10-11 05:56:57 +0000
2327+++ tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme 1970-01-01 00:00:00 +0000
2328@@ -1,1 +0,0 @@
2329-Ubuntu.Components.Themes.Ambiance
2330
2331=== modified file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir'
2332--- tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir 2013-10-11 05:56:57 +0000
2333+++ tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir 2015-05-02 11:10:54 +0000
2334@@ -1,2 +1,2 @@
2335 module TestTheme
2336-TestStyle 1.0 TestStyle.qml
2337\ No newline at end of file
2338+TestStyle 1.0 1.2/TestStyle.qml
2339
2340=== renamed directory 'tests/unit_x11/tst_subtheming/TestModule' => 'tests/unit_x11/tst_subtheming/CustomModule'
2341=== added file 'tests/unit_x11/tst_subtheming/DeprecatedTheme.qml'
2342--- tests/unit_x11/tst_subtheming/DeprecatedTheme.qml 1970-01-01 00:00:00 +0000
2343+++ tests/unit_x11/tst_subtheming/DeprecatedTheme.qml 2015-05-02 11:10:54 +0000
2344@@ -0,0 +1,25 @@
2345+/*
2346+ * Copyright 2015 Canonical Ltd.
2347+ *
2348+ * This program is free software; you can redistribute it and/or modify
2349+ * it under the terms of the GNU Lesser General Public License as published by
2350+ * the Free Software Foundation; version 3.
2351+ *
2352+ * This program is distributed in the hope that it will be useful,
2353+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2354+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2355+ * GNU Lesser General Public License for more details.
2356+ *
2357+ * You should have received a copy of the GNU Lesser General Public License
2358+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2359+ */
2360+import QtQuick 2.4
2361+import Ubuntu.Components 1.3
2362+
2363+StyledItem {
2364+ id: item
2365+ width: units.gu(40)
2366+ height: units.gu(40)
2367+ theme.name: "Ubuntu.Components.Themes.SuruGradient"
2368+ style: theme.createStyleComponent("OptionSelectorStyle.qml", item)
2369+}
2370
2371=== added file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml'
2372--- tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml 1970-01-01 00:00:00 +0000
2373+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml 2015-05-02 11:10:54 +0000
2374@@ -0,0 +1,24 @@
2375+/*
2376+ * Copyright 2015 Canonical Ltd.
2377+ *
2378+ * This program is free software; you can redistribute it and/or modify
2379+ * it under the terms of the GNU Lesser General Public License as published by
2380+ * the Free Software Foundation; version 3.
2381+ *
2382+ * This program is distributed in the hope that it will be useful,
2383+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2384+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2385+ * GNU Lesser General Public License for more details.
2386+ *
2387+ * You should have received a copy of the GNU Lesser General Public License
2388+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2389+ */
2390+import QtQuick 2.4
2391+import Ubuntu.Components 1.3
2392+
2393+StyledItem {
2394+ id: item
2395+ theme.name: "themes.CustomTheme"
2396+ theme.version: Ubuntu.version(1, 0)
2397+ style: theme.createStyleComponent("TestStyle.qml", item)
2398+}
2399
2400=== added file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml'
2401--- tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml 1970-01-01 00:00:00 +0000
2402+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml 2015-05-02 11:10:54 +0000
2403@@ -0,0 +1,24 @@
2404+/*
2405+ * Copyright 2015 Canonical Ltd.
2406+ *
2407+ * This program is free software; you can redistribute it and/or modify
2408+ * it under the terms of the GNU Lesser General Public License as published by
2409+ * the Free Software Foundation; version 3.
2410+ *
2411+ * This program is distributed in the hope that it will be useful,
2412+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2413+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2414+ * GNU Lesser General Public License for more details.
2415+ *
2416+ * You should have received a copy of the GNU Lesser General Public License
2417+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2418+ */
2419+import QtQuick 2.4
2420+import Ubuntu.Components 1.3
2421+
2422+StyledItem {
2423+ id: item
2424+ theme.name: "themes.CustomTheme"
2425+ theme.version: Ubuntu.toolkitVersion
2426+ style: theme.createStyleComponent("TestStyle.qml", item)
2427+}
2428
2429=== added file 'tests/unit_x11/tst_subtheming/StyledItemFallback.qml'
2430--- tests/unit_x11/tst_subtheming/StyledItemFallback.qml 1970-01-01 00:00:00 +0000
2431+++ tests/unit_x11/tst_subtheming/StyledItemFallback.qml 2015-05-02 11:10:54 +0000
2432@@ -0,0 +1,24 @@
2433+/*
2434+ * Copyright 2015 Canonical Ltd.
2435+ *
2436+ * This program is free software; you can redistribute it and/or modify
2437+ * it under the terms of the GNU Lesser General Public License as published by
2438+ * the Free Software Foundation; version 3.
2439+ *
2440+ * This program is distributed in the hope that it will be useful,
2441+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2442+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2443+ * GNU Lesser General Public License for more details.
2444+ *
2445+ * You should have received a copy of the GNU Lesser General Public License
2446+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2447+ */
2448+import QtQuick 2.4
2449+import Ubuntu.Components 1.3
2450+
2451+StyledItem {
2452+ id: item
2453+ theme.name: "TestModule.TestTheme"
2454+ theme.version: Ubuntu.version(1, 0)
2455+ style: theme.createStyleComponent("TestStyle.qml", item)
2456+}
2457
2458=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV12.qml'
2459--- tests/unit_x11/tst_subtheming/StyledItemV12.qml 2015-04-25 06:35:16 +0000
2460+++ tests/unit_x11/tst_subtheming/StyledItemV12.qml 2015-05-02 11:10:54 +0000
2461@@ -18,7 +18,7 @@
2462
2463 StyledItem {
2464 id: item
2465- theme.name: "CustomTheme"
2466+ theme.name: "themes.CustomTheme"
2467 theme.version: Ubuntu.version(1, 2)
2468 style: theme.createStyleComponent("TestStyle.qml", item)
2469 }
2470
2471=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV13.qml'
2472--- tests/unit_x11/tst_subtheming/StyledItemV13.qml 2015-04-25 06:35:16 +0000
2473+++ tests/unit_x11/tst_subtheming/StyledItemV13.qml 2015-05-02 11:10:54 +0000
2474@@ -18,7 +18,7 @@
2475
2476 StyledItem {
2477 id: item
2478- theme.name: "CustomTheme"
2479+ theme.name: "themes.CustomTheme"
2480 theme.version: Ubuntu.toolkitVersion
2481 style: theme.createStyleComponent("TestStyle.qml", item)
2482 }
2483
2484=== added directory 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2'
2485=== renamed file 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/TestStyle.qml' => 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2/TestStyle.qml'
2486=== modified file 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir'
2487--- tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir 2015-04-25 06:35:16 +0000
2488+++ tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir 2015-05-02 11:10:54 +0000
2489@@ -1,5 +1,5 @@
2490 module TestTheme
2491-TestStyle 1.0 TestStyle.qml
2492+TestStyle 1.0 ./1.2/TestStyle.qml
2493
2494 #version 1.3
2495 TestStyle 1.3 ./1.3/TestStyle.qml
2496
2497=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
2498--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp 2015-04-25 06:35:16 +0000
2499+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp 2015-05-02 11:10:54 +0000
2500@@ -146,7 +146,7 @@
2501 if (styleName == "NotExistingTestStyle.qml") {
2502 ThemeTestCase::ignoreWarning(parentName, 20, 1, "QML SimpleItem: Warning: Style NotExistingTestStyle.qml not found in theme TestModule.TestTheme");
2503 }
2504- qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
2505+ qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");
2506
2507 QScopedPointer<ThemeTestCase> view(new ThemeTestCase(parentName));
2508 view->setTheme("TestModule.TestTheme");
2509@@ -165,7 +165,7 @@
2510 QTest::addColumn<bool>("success");
2511
2512 QTest::newRow("One toolkit theme path")
2513- << "../tst_theme_engine" << ""
2514+ << "./themes" << ""
2515 << "TestModule.TestTheme" << "TestStyle.qml"
2516 << "" << true;
2517 QTest::newRow("Two toolkit theme paths")
2518@@ -173,7 +173,7 @@
2519 << "CustomTheme" << "TestStyle.qml"
2520 << "" << true;
2521 QTest::newRow("One XDG path")
2522- << "" << "../tst_theme_engine"
2523+ << "" << "./themes"
2524 << "TestModule.TestTheme" << "TestStyle.qml"
2525 << "" << true;
2526 QTest::newRow("Two XDG paths")
2527@@ -244,10 +244,10 @@
2528
2529 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
2530 qputenv("XDG_DATA_DIRS", "");
2531- qputenv("QML2_IMPORT_PATH", "/no/plugins/here:.");
2532+ qputenv("QML2_IMPORT_PATH", "/no/plugins/here");
2533
2534 QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
2535- view->setTheme("TestModule.TestTheme");
2536+ view->setTheme("CustomModule.TestTheme");
2537 }
2538
2539 void test_theme_not_root_theme()
2540@@ -255,7 +255,7 @@
2541 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
2542
2543 QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
2544- view->setTheme("TestModule.TestTheme");
2545+ view->setTheme("CustomModule.TestTheme");
2546 UCTheme *theme = view->theme();
2547 UCTheme *globalTheme = view->globalTheme();
2548 QVERIFY(theme);
2549@@ -265,7 +265,7 @@
2550
2551 void test_theme_reset_name()
2552 {
2553- qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
2554+ qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");
2555
2556 QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
2557 view->setTheme("TestModule.TestTheme");
2558@@ -626,29 +626,63 @@
2559 {
2560 QTest::addColumn<QString>("document");
2561 QTest::addColumn<QString>("testValue");
2562+ QTest::addColumn<int>("row");
2563+ QTest::addColumn<int>("column");
2564+ QTest::addColumn<QString>("warning");
2565
2566 QTest::newRow("Theming version 1.2")
2567 << "StyledItemV12.qml"
2568- << "";
2569+ << ""
2570+ << 0 << 0 << "";
2571 QTest::newRow("Theming version 1.3")
2572 << "StyledItemV13.qml"
2573- << "version1.3";
2574+ << "version1.3"
2575+ << 0 << 0 << "";
2576+ QTest::newRow("Fall back to 1.3")
2577+ << "StyledItemFallback.qml"
2578+ << "version1.3"
2579+ << 19 << 1 << "QML StyledItem: Theme 'TestModule.TestTheme' has no 'TestStyle.qml' style for version 1.0, fall back to version 1.3.";
2580+ QTest::newRow("App theme versioned")
2581+ << "StyledItemAppThemeVersioned.qml"
2582+ << "version1.3"
2583+ << 0 << 0 << "";
2584+ QTest::newRow("App theme fallback to non-versioned")
2585+ << "StyledItemAppThemeFallback.qml"
2586+ << ""
2587+ << 0 << 0 << "";
2588 }
2589 void test_theme_versions()
2590 {
2591 QFETCH(QString, document);
2592 QFETCH(QString, testValue);
2593+ QFETCH(int, row);
2594+ QFETCH(int, column);
2595+ QFETCH(QString, warning);
2596
2597 qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
2598 qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule");
2599+ if (!warning.isEmpty()) {
2600+ ThemeTestCase::ignoreWarning(document, row, column, warning, 2);
2601+ }
2602 QScopedPointer<ThemeTestCase> view(new ThemeTestCase(document));
2603 UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(view->rootObject());
2604+ QVERIFY(UCStyledItemBasePrivate::get(styledItem)->styleItem);
2605 QString newProperty(UCStyledItemBasePrivate::get(styledItem)->styleItem->property("newProperty").toString());
2606 QCOMPARE(newProperty, testValue);
2607 // NOTE TestTheme resets the theme therefore the theming will look for the tested style under Ambiance theme
2608 // which will cause a warning; therefore we mark the warning to be ignored
2609 ThemeTestCase::ignoreWarning(document, 19, 1, "QML StyledItem: Warning: Style TestStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance");
2610 }
2611+
2612+ void test_deprecated_theme()
2613+ {
2614+ qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
2615+ qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule:" + m_themesPath.toLatin1());
2616+ QScopedPointer<ThemeTestCase> view(new ThemeTestCase("DeprecatedTheme.qml"));
2617+ // NOTE TestTheme resets the theme therefore the theming will look for the tested style version under Ambiance theme
2618+ // which will cause a warning; therefore we mark the warning to be ignored
2619+ ThemeTestCase::ignoreWarning("DeprecatedTheme.qml", 19, 1, "QML StyledItem: Theme 'Ubuntu.Components.Themes.Ambiance' has no 'OptionSelectorStyle.qml' style for version 1.0, fall back to version 1.3.");
2620+ }
2621 };
2622
2623 QTEST_MAIN(tst_Subtheming)
2624
2625=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro'
2626--- tests/unit_x11/tst_subtheming/tst_subtheming.pro 2015-04-25 06:35:16 +0000
2627+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro 2015-05-02 11:10:54 +0000
2628@@ -8,7 +8,8 @@
2629 themes/CustomTheme/TestStyle.qml \
2630 themes/CustomTheme/Palette.qml \
2631 themes/CustomTheme/parent_theme \
2632- themes/TestModule/TestTheme/TestStyle.qml \
2633+ themes/TestModule/TestTheme/1.2/TestStyle.qml \
2634+ themes/TestModule/TestTheme/1.3/TestStyle.qml \
2635 themes/TestModule/TestTheme/qmldir \
2636 themes/TestModule/TestTheme/parent_theme \
2637 DynamicAssignment.qml \
2638@@ -26,6 +27,10 @@
2639 themes/TestModule/TestTheme/1.3/TestStyle.qml \
2640 themes/CustomTheme/1.3/TestStyle.qml \
2641 StyledItemV12.qml \
2642- StyledItemV13.qml
2643+ StyledItemV13.qml \
2644+ StyledItemFallback.qml \
2645+ StyledItemAppThemeFallback.qml \
2646+ DeprecatedTheme.qml \
2647+ StyledItemAppThemeVersioned.qml
2648
2649

Subscribers

People subscribed via source and target branches