diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-17 16:22:41 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-18 13:13:36 +0200 |
commit | c96a6ab627100452864eb4d8da973300401c1bfa (patch) | |
tree | 0ecd0f390685c976efcd1df2fadc09193f190bbf /src/gui/kernel/qplatformintegrationplugin.cpp | |
parent | 066d32d7435ecda9e9fe0447ea06c9be672cfea3 (diff) |
Pass argc, argv to the platform plugins.
Allow for parsing of X11-specific arguments like -display,
-geometry. Introduce overload of
QPlatformIntegration::create() with argc and argv
and provide default implementation that calls the old version
(for platforms that do not have argc, argv). Provide default
implementation for the old version returning 0 so that platforms
using the new API compile.
Prototypically implement -display in XCB.
Task-number: QTBUG-29396
Change-Id: I6a0e9271fad6e2d10f11b80393025ae3a3e36623
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/gui/kernel/qplatformintegrationplugin.cpp')
-rw-r--r-- | src/gui/kernel/qplatformintegrationplugin.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformintegrationplugin.cpp b/src/gui/kernel/qplatformintegrationplugin.cpp index 0f7f365d2a..2a9a047141 100644 --- a/src/gui/kernel/qplatformintegrationplugin.cpp +++ b/src/gui/kernel/qplatformintegrationplugin.cpp @@ -52,4 +52,18 @@ QPlatformIntegrationPlugin::~QPlatformIntegrationPlugin() { } +QPlatformIntegration *QPlatformIntegrationPlugin::create(const QString &key, const QStringList ¶mList) +{ + Q_UNUSED(key) + Q_UNUSED(paramList); + return 0; +} + +QPlatformIntegration *QPlatformIntegrationPlugin::create(const QString &key, const QStringList ¶mList, int &argc, char **argv) +{ + Q_UNUSED(argc) + Q_UNUSED(argv) + return create(key, paramList); // Fallback for platform plugins that do not implement the argc/argv version. +} + QT_END_NAMESPACE |