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

[Zsombor Egri]

Pick up the right style.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1893
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/485/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1668/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/485/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1893
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/486/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1669/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/486/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1893
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/487/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1670/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/487/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

Good. Only one comment about the name of the test below.

review: Needs Fixing

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1893
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/252/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1674/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/252/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1893
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/475/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1675/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/475/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1893
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/229/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1678/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/229/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1893
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/145/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/475
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/485/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/252
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/229
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1679/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1675
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1668
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1674
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1678

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/145/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

thanks

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1895
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/491/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1683/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/491/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/254/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1687/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/254/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/477/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1688/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/477/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/231/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1689/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/231/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/489/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1690/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/489/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/147/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/477
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/489
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/489/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/254
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/231
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1691/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1688
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1690
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1687
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1689

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/147/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1895
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/479/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1694/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/479/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1895
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/256/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1697/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/256/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1895
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/233/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1699/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/233/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/194/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/479
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/491/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/256
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/233
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/199/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1694
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1683
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1697
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1699

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

armhf builds seem broken in several MRs.

Let's try again.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1895
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/497/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1717/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/497/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

(and again, pbuilder now recreated during the night)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1895
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/263/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1724/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/263/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1895
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/485/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1725/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/485/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1895
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/239/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1729/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/239/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1895
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/498/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1730/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/498/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/plugin/uctheme.cpp'
--- src/Ubuntu/Components/plugin/uctheme.cpp	2016-03-07 15:51:52 +0000
+++ src/Ubuntu/Components/plugin/uctheme.cpp	2016-03-14 18:20:09 +0000
@@ -587,25 +587,30 @@
     if (isFallback) {
         (*isFallback) = false;
     }
-    Q_FOREACH (const ThemeRecord &themePath, m_themePaths) {
-        QUrl styleUrl;
-        /*
-         * There are two cases where we have to deal with non-versioned styles: application
-         * themes made for the previous theming and deprecated themes. For shared themes,
-         * we have to check the fallback case.
-         */
-        quint16 styleVersion = version;
-        if (themePath.deprecated) {
-            styleVersion = 0;
-        }
-        if (themePath.shared && (version < BUILD_VERSION(1, 2))) {
-            styleVersion = LATEST_UITK_VERSION;
-        }
-
-        // loop through the versions to see if we have one matching
-        // we stop at version 1.2 as we do not have support for earlier themes anymore.
-        for (int minor = MINOR_VERSION(styleVersion); minor >= 2; minor--) {
-            QString versionedName = QStringLiteral("%1.%2/%3").arg(MAJOR_VERSION(styleVersion)).arg(minor).arg(styleName);
+
+    // loop through the versions first, so we will look after the style in all
+    // the parents, then fall back to the older version
+    quint16 major = MAJOR_VERSION(version);
+    // loop through the versions to see if we have one matching
+    // we stop at version 1.2 as we do not have support for earlier themes anymore.
+    for (int minor = MINOR_VERSION(version); minor >= 2; minor--) {
+        // check with each path of the theme
+        Q_FOREACH (const ThemeRecord &themePath, m_themePaths) {
+            QUrl styleUrl;
+            /*
+             * There are two cases where we have to deal with non-versioned styles: application
+             * themes made for the previous theming and deprecated themes. For shared themes,
+             * we have to check the fallback case.
+             */
+            quint16 styleVersion = BUILD_VERSION(major, minor);
+            if (themePath.deprecated) {
+                styleVersion = 0;
+            }
+            if (themePath.shared && (minor < 2)) {
+                styleVersion = LATEST_UITK_VERSION;
+            }
+
+            QString versionedName = QStringLiteral("%1.%2/%3").arg(major).arg(minor).arg(styleName);
             styleUrl = themePath.path.resolved(versionedName);
             if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
                 // set fallback warning if the theme is shared
@@ -614,13 +619,13 @@
                 }
                 return styleUrl;
             }
-        }
 
-        // if we don't get any style, get the non-versioned ones for non-shared and deprecated styles
-        if (!themePath.shared || themePath.deprecated) {
-            styleUrl = themePath.path.resolved(styleName);
-            if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
-                return styleUrl;
+            // if we don't get any style, get the non-versioned ones for non-shared and deprecated styles
+            if (!themePath.shared || themePath.deprecated) {
+                styleUrl = themePath.path.resolved(styleName);
+                if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
+                    return styleUrl;
+                }
             }
         }
     }

=== added directory 'tests/unit_x11/tst_subtheming/themes/DerivedTheme'
=== added directory 'tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.2'
=== added file 'tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.2/TestStyle.qml'
--- tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.2/TestStyle.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.2/TestStyle.qml	2016-03-14 18:20:09 +0000
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Item {
+    objectName: "TestStyle"
+}

=== added directory 'tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.3'
=== added file 'tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.3/Palette.qml'
--- tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.3/Palette.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.3/Palette.qml	2016-03-14 18:20:09 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes.Ambiance 1.3 as Suru
+
+Suru.Palette {
+    normal.selection: UbuntuColors.orange
+    selected.selection: UbuntuColors.lightGrey
+    selected.base: "lightblue"
+    selected.baseText: "pink"
+    selected.overlay: "#ABCDEF"
+    selected.overlayText: "#FEDCBA"
+    selected.fieldText: UbuntuColors.red
+}

=== added file 'tests/unit_x11/tst_subtheming/themes/DerivedTheme/parent_theme'
--- tests/unit_x11/tst_subtheming/themes/DerivedTheme/parent_theme	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/themes/DerivedTheme/parent_theme	2016-03-14 18:20:09 +0000
@@ -0,0 +1,1 @@
+TestTheme

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2016-01-30 10:51:22 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2016-03-14 18:20:09 +0000
@@ -20,7 +20,11 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
+#define private public
+#define protected public
 #include "uctheme.h"
+#undef protected
+#undef private
 #include "quickutils.h"
 #include "uctestcase.h"
 #include "ucstyleditembase_p.h"
@@ -898,6 +902,21 @@
         QTest::mouseRelease(view.data(), Qt::LeftButton, 0, pressPt.toPoint());
         QCOMPARE(pressedColor, colorPressed);
     }
+
+    void test_derived_theme_fallback_should_use_proper_style_bug1555797() {
+        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
+        qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule");
+
+        QQmlEngine engine;
+        UbuntuComponentsPlugin::initializeContextProperties(&engine);
+        QScopedPointer<UCTheme> theme(new UCTheme);
+        theme->setName("DerivedTheme");
+
+        // get the style URL
+        bool fallback = false;
+        QUrl style = theme->styleUrl("TestStyle.qml", BUILD_VERSION(1, 3), &fallback);
+        QVERIFY(style.toString().endsWith("TestTheme/1.3/TestStyle.qml"));
+    }
 };
 
 QTEST_MAIN(tst_Subtheming)

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro'
--- tests/unit_x11/tst_subtheming/tst_subtheming.pro	2016-01-08 09:31:30 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro	2016-03-14 18:20:09 +0000
@@ -42,9 +42,10 @@
     GroupPropertyBindingHints.qml \
     OverrideStyleHints.qml \
     HintedButton.qml \
-    OtherVersion.qml
-
-DISTFILES += \
-    DefaultTheme.qml
+    OtherVersion.qml \
+    DefaultTheme.qml \
+    themes/DerivedTheme/parent_theme \
+    themes/DerivedTheme/1.2/TestStyle.qml \
+    themes/DerivedTheme/1.3/Palette.qml