whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac: Remove broken platformPluginPath code. 

The missing "/" in front of "../Plugins" prevents
this from working - platformPluginPath is never
set.

Deployed platform plugin loading works in spite of
this via qt.conf which adds the plugin path to
QCoreApplication::libraryPaths().

Change-Id: I7ae4d13c65a380ddad72bffd29b776c39ea91c8a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
bb10
Morten Johan Sørvig 2013-02-12 11:34:55 +01:00 committed by The Qt Project
parent 60c1f9f274
commit f5acd545a8
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/kernel/qguiapplication.cpp
View File

@ -851,15 +851,6 @@ void QGuiApplicationPrivate::createPlatformIntegration()
// Load the platform integration
QString platformPluginPath = QLatin1String(qgetenv("QT_QPA_PLATFORM_PLUGIN_PATH"));
// On Mac, look inside the application bundle for the platform plugin.
// TODO (msorvig): Create proper cross-platform solution for loading
// deployed platform plugins
#ifdef Q_OS_MAC
const QString bundlePluginPath = QCoreApplication::applicationDirPath() + QLatin1String("../Plugins/");
if (platformPluginPath.isEmpty() && QDir(bundlePluginPath).exists()) {
platformPluginPath = bundlePluginPath;
}
#endif
QByteArray platformName;
#ifdef QT_QPA_DEFAULT_PLATFORM_NAME