Merge lp:~zsombi/ubuntu-ui-toolkit/fixThemingFallback into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

StyledItem does no longer fall back to 1.2 style loading on mixed import versions.

StyledItem does no longer fall back to 1.2 style loading on mixed import versions.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1675
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2362/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1090
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1092
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1092/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1089

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2362/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

Solves the problem

[Zoltan Balogh (bzoltan)]

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-09-28 07:06:36 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-10-06 07:18:45 +0000
@@ -28,6 +28,7 @@
 UCStyledItemBasePrivate::UCStyledItemBasePrivate()
     : styleComponent(Q_NULLPTR)
     , styleItem(Q_NULLPTR)
+    , styleVersion(LATEST_UITK_VERSION)
     , activeFocusOnPress(false)
     , wasStyleLoaded(false)
 {
@@ -307,7 +308,7 @@
     // either styleComponent or styleName is valid
     QQmlComponent *component = styleComponent;
     if (!component) {
-        component = getTheme()->createStyleComponent(styleDocument + ".qml", q);
+        component = getTheme()->createStyleComponent(styleDocument + ".qml", q, styleVersion);
     }
     if (!component) {
         return false;
@@ -473,13 +474,9 @@
     QQmlPropertyData *pdata = QQmlPropertyCache::property(qmlEngine(this), this, QStringLiteral("theme"), cdata, l);
     // FIXME MainView internal styler uses theme property, meaning imports13 will be true,
     // therefore we must check the type of the property as well in case anyone else overrides it
-    bool imports13 = data->propertyCache->isAllowedInRevision(pdata) && (property("theme").type() != QVariant::String);
-    if (!imports13) {
-        // load 1.2 theme
-        UCTheme *theme = d->getTheme();
-        // FIXME: override the global theme version to be used when creating new themes!
-        theme->setVersion(BUILD_VERSION(1, 2));
-    }
+    d->styleVersion = data->propertyCache->isAllowedInRevision(pdata) && (property("theme").type() != QVariant::String)
+            ? BUILD_VERSION(1, 3)
+            : BUILD_VERSION(1, 2);
     // no animation at this time
     // prepare style context if not been done yet
     d->postStyleChanged();

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-09-21 11:40:22 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-10-06 07:18:45 +0000
@@ -64,6 +64,7 @@
     QString styleDocument;
     QQmlComponent *styleComponent;
     QQuickItem *styleItem;
+    quint16 styleVersion;
     bool activeFocusOnPress:1;
     bool wasStyleLoaded:1;
 

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-09-22 13:40:32 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-10-06 07:18:45 +0000
@@ -636,44 +636,21 @@
     {
         QTest::addColumn<QString>("document");
         QTest::addColumn<QString>("testValue");
-        QTest::addColumn<int>("row");
-        QTest::addColumn<int>("column");
-        QTest::addColumn<QString>("warning");
 
-        QTest::newRow("Theming version 1.2")
-                << "StyledItemV12.qml"
-                << ""
-                << 0 << 0 << "";
         QTest::newRow("Theming version 1.3")
                 << "StyledItemV13.qml"
-                << "version1.3"
-                << 0 << 0 << "";
-        QTest::newRow("Fall back to 1.3")
-                << "StyledItemFallback.qml"
-                << "version1.3"
-                << 19 << 1 << "QML StyledItem: Theme 'TestModule.TestTheme' has no 'TestStyle.qml' style for version 1.0, fall back to version 1.3.";
+                << "version1.3";
         QTest::newRow("App theme versioned")
                 << "StyledItemAppThemeVersioned.qml"
-                << "version1.3"
-                << 0 << 0 << "";
-        QTest::newRow("App theme fallback to non-versioned")
-                << "StyledItemAppThemeFallback.qml"
-                << ""
-                << 0 << 0 << "";
+                << "version1.3";
     }
     void test_theme_versions()
     {
         QFETCH(QString, document);
         QFETCH(QString, testValue);
-        QFETCH(int, row);
-        QFETCH(int, column);
-        QFETCH(QString, warning);
 
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
         qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule");
-        if (!warning.isEmpty()) {
-            ThemeTestCase::ignoreWarning(document, row, column, warning);
-        }
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase(document));
         UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(view->rootObject());
         QVERIFY(UCStyledItemBasePrivate::get(styledItem)->styleItem);
@@ -689,9 +666,6 @@
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
         qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule:" + m_themesPath.toLatin1());
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("DeprecatedTheme.qml"));
-        // NOTE TestTheme resets the theme therefore the theming will look for the tested style version under Ambiance theme
-        // which will cause a warning; therefore we mark the warning to be ignored
-        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.");
     }
 
     void test_style_change_has_precedence()