diff options
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 4096628d93..b1cbb5fcae 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -54,6 +54,7 @@ #include <QtCore/private/qabstracteventdispatcher_p.h> #include <QtCore/qmutex.h> #include <QtCore/private/qthread_p.h> +#include <QtCore/qdir.h> #include <QtDebug> #include <qpalette.h> #include <qscreen.h> @@ -384,8 +385,9 @@ void QGuiApplicationPrivate::createPlatformIntegration() // TODO (msorvig): Create proper cross-platform solution for loading // deployed platform plugins #ifdef Q_OS_MAC - if (platformPluginPath.isEmpty()) { - platformPluginPath = QCoreApplication::applicationDirPath() + QLatin1String("../Plugins/"); + const QString bundlePluginPath = QCoreApplication::applicationDirPath() + QLatin1String("../Plugins/"); + if (platformPluginPath.isEmpty() && QDir(bundlePluginPath).exists()) { + platformPluginPath = bundlePluginPath; } #endif |