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

[Zsombor Egri]

Deprecated Theme forces palette to be loaded from 1.2 themes.

[Andrea Bernabei (faenil)]

just a typo, looks good otherwise

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

PASSED: Continuous integration, rev:1868
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/171/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1279/console

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

review: Approve (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/wrongPaletteIn12]

1869. By Zsombor Egri on 2016-02-25

typo fixed

[Zsombor Egri (zsombi)]

> just a typo, looks good otherwise

Fixed.

[Andrea Bernabei (faenil)]

great, thanks! :)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
--- src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2016-01-11 17:18:51 +0000
+++ src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2016-02-25 19:50:35 +0000
@@ -131,7 +131,8 @@
 QObject* UCDeprecatedTheme::palette()
 {
     showDeprecatedNote(this, "Theme.palette is deprecated. Use ThemeSettings instead.");
-    return defaultTheme()->palette();
+    // force loading 1.2 palette!
+    return defaultTheme()->palette(BUILD_VERSION(1, 2));
 }
 
 /*!
 
=== modified file 'src/Ubuntu/Components/plugin/uctheme.cpp'
--- src/Ubuntu/Components/plugin/uctheme.cpp	2016-02-01 18:57:26 +0000
+++ src/Ubuntu/Components/plugin/uctheme.cpp	2016-02-25 19:50:35 +0000
@@ -537,9 +537,13 @@
  * The palette doesn't need to be reset as it automatically resets when the
  * palette used for configuration is destroyed.
  */
-QObject* UCTheme::palette()
+QObject* UCTheme::palette(quint16 version)
 {
     if (!m_palette) {
+        if (version) {
+            // force version to be used
+            previousVersion = version;
+        }
         loadPalette(qmlEngine(this), false);
     }
     return m_palette;
 
=== modified file 'src/Ubuntu/Components/plugin/uctheme.h'
--- src/Ubuntu/Components/plugin/uctheme.h	2016-01-11 17:14:43 +0000
+++ src/Ubuntu/Components/plugin/uctheme.h	2016-02-25 19:50:35 +0000
@@ -72,7 +72,7 @@
     QString name() const;
     void setName(const QString& name);
     void resetName();
-    QObject* palette();
+    QObject* palette(quint16 version = 0);
     void setPalette(QObject *config);
     static void checkMixedVersionImports(QQuickItem *item, quint16 version);
 
 
=== added file 'tests/unit_x11/tst_deprecated_theme_engine/ErroneousPaletteUse.qml'
--- tests/unit_x11/tst_deprecated_theme_engine/ErroneousPaletteUse.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_deprecated_theme_engine/ErroneousPaletteUse.qml	2016-02-25 19:50:35 +0000
@@ -0,0 +1,33 @@
+/*
+ * 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.2
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Page {
+        title: "Hello, I am blue." // should be darkGrey
+        Label {
+            anchors.centerIn: parent
+            text: "bla"
+            color: Theme.palette.normal.negative // this color does not exist in 1.2 palette
+        }
+    }
+}
+
 
=== modified file 'tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp'
--- tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp	2016-02-10 10:35:50 +0000
+++ tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp	2016-02-25 19:50:35 +0000
@@ -94,6 +94,7 @@
     void testNoImportPathSet();
     void testBogusImportPathSet();
     void testMultipleImportPathsSet();
+    void testPaletteUsed_bug1549830();
 };
 
 void tst_UCDeprecatedTheme::initTestCase()
@@ -257,6 +258,13 @@
     view->setTheme("TestModule.TestTheme");
 }
 
+void tst_UCDeprecatedTheme::testPaletteUsed_bug1549830()
+{
+    ThemeTestCase::ignoreWarning("ErroneousPaletteUse.qml", 29, 20, "Unable to assign [undefined] to QColor", 3);
+    QScopedPointer<ThemeTestCase> view(new ThemeTestCase("ErroneousPaletteUse.qml"));
+}
+
+
 QTEST_MAIN(tst_UCDeprecatedTheme)
 
 #include "tst_deprecated_theme_engine.moc"
 
=== modified file 'tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro'
--- tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro	2016-01-11 06:17:26 +0000
+++ tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro	2016-02-25 19:50:35 +0000
@@ -11,4 +11,5 @@
     themes/CustomTheme/parent_theme \
     themes/TestModule/TestTheme/TestStyle.qml \
     themes/TestModule/TestTheme/qmldir \
-    themes/TestModule/TestTheme/parent_theme
+    themes/TestModule/TestTheme/parent_theme \
+    ErroneousPaletteUse.qml