diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-10-10 14:40:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-16 13:10:02 +0200 |
| commit | 0232fa3979e0e5d8485de94950f514bfd861d22b (patch) | |
| tree | 68f09e10c5a36df226a40a295bc80fa871ee5291 /src/gui/kernel | |
| parent | da35793ee5cf73c45e3d1d9a994abf8be61fff14 (diff) | |
Add platform plugin arguments to QLibraryInfo/qt.conf.
Make it possible to specify arguments to the platform plugins in a
section of the qt.conf file:
[Platforms]
WindowsArguments=fontengine=freetype
Change-Id: Ia05d0fa004471dcb74c78a88eec3b220ec3c6ad8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index f555894b6d..591e83c0bd 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -59,6 +59,7 @@ #include <QtCore/qmutex.h> #include <QtCore/private/qthread_p.h> #include <QtCore/qdir.h> +#include <QtCore/qlibraryinfo.h> #include <QtDebug> #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" @@ -892,6 +893,9 @@ static void init_platform(const QString &pluginArgument, const QString &platform // Split into platform name and arguments QStringList arguments = pluginArgument.split(QLatin1Char(':')); const QString name = arguments.takeFirst().toLower(); + QString argumentsKey = name; + argumentsKey[0] = argumentsKey.at(0).toUpper(); + arguments.append(QLibraryInfo::platformPluginArguments(argumentsKey)); // Create the platform integration. QGuiApplicationPrivate::platform_integration = QPlatformIntegrationFactory::create(name, arguments, argc, argv, platformPluginPath); |