diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:10 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:11 +0200 |
| commit | 464a43d43c2bb2440d4ad745bc134e0dac10872c (patch) | |
| tree | b1c27b1d1c11f9c43bd2e62e1fd955bc6f89029f /src/gui/kernel | |
| parent | 0208cac94fbd79fc563c903e2b973d79f9644b82 (diff) | |
| parent | 877ef0594d94f48bf063446b1f8a4b5e1941a8cd (diff) | |
Merge 5.9 into 5.9.0v5.9.0-beta4
Change-Id: Id3fc911f024cba292a5c426b36aa94ff9f3c0ef7
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformthemefactory_p.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 56f112c36c..1dd019cd55 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1319,6 +1319,10 @@ void QGuiApplicationPrivate::eventDispatcherReady() void QGuiApplicationPrivate::init() { +#if defined(Q_OS_MACOS) + QMacAutoReleasePool pool; +#endif + QCoreApplicationPrivate::init(); QCoreApplicationPrivate::is_app_running = false; // Starting up. diff --git a/src/gui/kernel/qplatformthemefactory_p.h b/src/gui/kernel/qplatformthemefactory_p.h index 3f77f03485..c312eadf27 100644 --- a/src/gui/kernel/qplatformthemefactory_p.h +++ b/src/gui/kernel/qplatformthemefactory_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QPlatformTheme; -class QPlatformThemeFactory +class Q_GUI_EXPORT QPlatformThemeFactory { public: static QStringList keys(const QString &platformPluginPath = QString()); |