Merge master into api_changes

Conflicts:
	src/corelib/kernel/qmetatype.cpp
	src/gui/kernel/qplatformsurface_qpa.cpp
	tests/auto/corelib/tools/qtimeline/qtimeline.pro

Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178

1 files changed, 8 insertions, 1 deletions

diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
index a9db29e8cd..cabffc0212 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
@@ -67,11 +67,14 @@ class QGenericUnixTheme : public QPlatformTheme
 public:
     QGenericUnixTheme() {}
 
-    static QPlatformTheme *createUnixTheme();
+    static QPlatformTheme *createUnixTheme(const QString &name);
+    static QStringList themeNames();
 
     virtual QVariant themeHint(ThemeHint hint) const;
 
     static QStringList xdgIconThemePaths();
+
+    static const char *name;
 };
 
 class QKdeTheme : public QPlatformTheme
@@ -88,6 +91,8 @@ public:
     virtual const QFont *font(Font type) const
         { return m_resources.fonts[type]; }
 
+    static const char *name;
+
 private:
     QString globalSettingsFile() const;
     void refresh();
@@ -109,6 +114,8 @@ public:
     QGnomeTheme() {}
     virtual QVariant themeHint(ThemeHint hint) const;
 
+    static const char *name;
+
 private:
 };