Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	.qmake.conf
	src/quicktemplates2/qquickabstractbutton_p.h

Change-Id: I265cbd2ce51beaf2afef99292c2e2798dadb4ba3

8 files changed, 25 insertions, 54 deletions

diff --git a/src/imports/controls/imagine/CheckBox.qml b/src/imports/controls/imagine/CheckBox.qml
index db0a6680..8c5cd918 100644
--- a/src/imports/controls/imagine/CheckBox.qml
+++ b/src/imports/controls/imagine/CheckBox.qml
@@ -82,8 +82,6 @@ T.CheckBox {
         font: control.font
         color: control.palette.windowText
         elide: Text.ElideRight
-        visible: control.text
-        horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
 
diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml
index fc9fce61..eae8569e 100644
--- a/src/imports/controls/imagine/ComboBox.qml
+++ b/src/imports/controls/imagine/ComboBox.qml
@@ -98,7 +98,6 @@ T.ComboBox {
         color: control.flat ? control.palette.windowText : control.editable ? control.palette.text : control.palette.buttonText
         selectionColor: control.palette.highlight
         selectedTextColor: control.palette.highlightedText
-        horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
 
diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/imports/controls/imagine/GroupBox.qml
index 88e8d21c..b2b199a3 100644
--- a/src/imports/controls/imagine/GroupBox.qml
+++ b/src/imports/controls/imagine/GroupBox.qml
@@ -68,7 +68,6 @@ T.GroupBox {
         text: control.title
         font: control.font
         elide: Text.ElideRight
-        horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
 
         color: control.palette.windowText
diff --git a/src/imports/controls/imagine/RadioButton.qml b/src/imports/controls/imagine/RadioButton.qml
index 4a111bc3..57bdedaa 100644
--- a/src/imports/controls/imagine/RadioButton.qml
+++ b/src/imports/controls/imagine/RadioButton.qml
@@ -81,8 +81,6 @@ T.RadioButton {
         font: control.font
         color: control.palette.windowText
         elide: Text.ElideRight
-        visible: control.text
-        horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
 
diff --git a/src/imports/controls/imagine/Switch.qml b/src/imports/controls/imagine/Switch.qml
index f9878851..44e5d68e 100644
--- a/src/imports/controls/imagine/Switch.qml
+++ b/src/imports/controls/imagine/Switch.qml
@@ -110,8 +110,6 @@ T.Switch {
         font: control.font
         color: control.palette.windowText
         elide: Text.ElideRight
-        visible: control.text
-        horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
 
diff --git a/src/imports/controls/imagine/plugins.qmltypes b/src/imports/controls/imagine/plugins.qmltypes
new file mode 100644
index 00000000..b09ae141
--- /dev/null
+++ b/src/imports/controls/imagine/plugins.qmltypes
@@ -0,0 +1,21 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtQuick.Controls.Imagine 2.3'
+
+Module {
+    dependencies: []
+    Component { name: "QQuickAttachedObject"; prototype: "QObject" }
+    Component {
+        name: "QQuickImagineStyle"
+        prototype: "QQuickAttachedObject"
+        exports: ["QtQuick.Controls.Imagine/Imagine 2.3"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "path"; type: "string" }
+        Property { name: "url"; type: "QUrl"; isReadonly: true }
+    }
+}
diff --git a/src/imports/controls/imagine/qquickimaginetheme.cpp b/src/imports/controls/imagine/qquickimaginetheme.cpp
index 17fb920f..5505e7ce 100644
--- a/src/imports/controls/imagine/qquickimaginetheme.cpp
+++ b/src/imports/controls/imagine/qquickimaginetheme.cpp
@@ -43,20 +43,8 @@ QT_BEGIN_NAMESPACE
 QQuickImagineTheme::QQuickImagineTheme()
     : QQuickTheme(QStringLiteral("Imagine"))
 {
-    QFont font;
-    font.setFamily(QLatin1String("Open Sans"));
-    const QString family = QFontInfo(font).family();
-    if (family == QLatin1String("Open Sans")) {
-        buttonFont.setFamily(family);
-        checkBoxFont.setFamily(family);
-        editorFont.setFamily(family);
-        groupBoxFont.setFamily(family);
-        labelFont.setFamily(family);
-        itemViewFont.setFamily(family);
-        menuItemFont.setFamily(family);
-        systemFont.setFamily(family);
-        toolTipFont.setFamily(family);
-    }
+    systemFont.setFamily(QLatin1String("Open Sans"));
+    systemFont = resolveFont(systemFont);
 
     const QColor accentColor = QColor::fromRgb(0x4fc1e9);
     const QColor windowTextColor = QColor::fromRgb(0x434a54);
@@ -76,29 +64,8 @@ QQuickImagineTheme::QQuickImagineTheme()
 
 const QFont *QQuickImagineTheme::font(QPlatformTheme::Font type) const
 {
-    switch (type) {
-    case QPlatformTheme::TabButtonFont:
-    case QPlatformTheme::PushButtonFont:
-    case QPlatformTheme::ToolButtonFont:
-        return &buttonFont;
-    case QPlatformTheme::CheckBoxFont:
-        return &checkBoxFont;
-    case QPlatformTheme::GroupBoxTitleFont:
-        return &groupBoxFont;
-    case QPlatformTheme::LabelFont:
-        return &labelFont;
-    case QPlatformTheme::TipLabelFont:
-        return &toolTipFont;
-    case QPlatformTheme::ItemViewFont:
-        return &itemViewFont;
-    case QPlatformTheme::MenuItemFont:
-    case QPlatformTheme::ComboMenuItemFont:
-        return &menuItemFont;
-    case QPlatformTheme::EditorFont:
-        return &editorFont;
-    default:
-        return &systemFont;
-    }
+    Q_UNUSED(type);
+    return &systemFont;
 }
 
 const QPalette *QQuickImagineTheme::palette(QPlatformTheme::Palette type) const
diff --git a/src/imports/controls/imagine/qquickimaginetheme_p.h b/src/imports/controls/imagine/qquickimaginetheme_p.h
index 9006e6ef..ea3a1cbd 100644
--- a/src/imports/controls/imagine/qquickimaginetheme_p.h
+++ b/src/imports/controls/imagine/qquickimaginetheme_p.h
@@ -61,16 +61,7 @@ public:
     const QPalette *palette(Palette type = SystemPalette) const override;
 
 private:
-    QFont buttonFont;
-    QFont checkBoxFont;
-    QFont editorFont;
-    QFont groupBoxFont;
-    QFont labelFont;
-    QFont itemViewFont;
-    QFont menuItemFont;
     QFont systemFont;
-    QFont toolTipFont;
-
     QPalette systemPalette;
 };