path: root/src/gui/kernel/qplatformintegrationplugin.h
diff options
authorFriedemann Kleint <>2013-07-17 16:22:41 +0200
committerThe Qt Project <>2013-07-18 13:13:36 +0200
commitc96a6ab627100452864eb4d8da973300401c1bfa (patch)
tree0ecd0f390685c976efcd1df2fadc09193f190bbf /src/gui/kernel/qplatformintegrationplugin.h
parent066d32d7435ecda9e9fe0447ea06c9be672cfea3 (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 <>
Diffstat (limited to 'src/gui/kernel/qplatformintegrationplugin.h')
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformintegrationplugin.h b/src/gui/kernel/qplatformintegrationplugin.h
index 434366f0b0..674622f84a 100644
--- a/src/gui/kernel/qplatformintegrationplugin.h
+++ b/src/gui/kernel/qplatformintegrationplugin.h
@@ -68,7 +68,8 @@ public:
explicit QPlatformIntegrationPlugin(QObject *parent = 0);
- virtual QPlatformIntegration *create(const QString &key, const QStringList &paramList) = 0;
+ virtual QPlatformIntegration *create(const QString &key, const QStringList &paramList);
+ virtual QPlatformIntegration *create(const QString &key, const QStringList &paramList, int &argc, char **argv);