Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827

1 files changed, 3 insertions, 13 deletions

diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 7e6e0aa8c7..68546ce0cf 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -89,19 +89,6 @@ public:
     static QPlatformTheme *platformTheme()
     { return platform_theme; }
 
-
-    enum KeyPlatform {
-        KB_Win = 1,
-        KB_Mac = 2,
-        KB_X11 = 4,
-        KB_KDE = 8,
-        KB_Gnome = 16,
-        KB_CDE = 32,
-        KB_All = 0xffff
-    };
-
-    static uint currentKeyPlatform();
-
     static QAbstractEventDispatcher *qt_qpa_core_dispatcher()
     { return QCoreApplication::instance()->d_func()->threadData->eventDispatcher; }
 
@@ -213,6 +200,9 @@ public:
     };
     QHash<QWindow *, SynthesizedMouseData> synthesizedMousePoints;
 
+protected:
+    virtual void notifyThemeChanged();
+
 private:
     void init();