diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-25 08:49:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-25 15:09:51 +0200 |
| commit | 15b45c608fce1845e7f8c61edaeb35f0acc11ed9 (patch) | |
| tree | f595d40a5ab4be0e859948b55363e90ef37a49ad /src/plugins/platforms/xcb/qxcbintegration.cpp | |
| parent | d7e37537d4fa2127e6ec404b9f8358337f63d9b1 (diff) | |
XCB: Readd support for -name command line argument.
Task-number: QTBUG-27349
Change-Id: I85390942927cd1c54f76fd7ddc0f3487c7205b57
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 46077e2c3f..68ad93143b 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -122,6 +122,7 @@ static bool runningUnderDebugger() QXcbIntegration::QXcbIntegration(const QStringList ¶meters, int &argc, char **argv) : m_eventDispatcher(createUnixEventDispatcher()) , m_services(new QGenericUnixServices) + , m_instanceName(0) { QGuiApplicationPrivate::instance()->setEventDispatcher(m_eventDispatcher); @@ -148,6 +149,9 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters, int &argc, char if (!strcmp(arg, "-display") && i < argc - 1) { displayName = argv[++i]; arg = 0; + } else if (!strcmp(arg, "-name") && i < argc - 1) { + m_instanceName = argv[++i]; + arg = 0; } } if (arg) @@ -409,6 +413,8 @@ QByteArray QXcbIntegration::wmClass() const if (m_wmClass.isEmpty()) { // Instance name according to ICCCM 4.1.2.5 QString name; + if (m_instanceName) + name = QString::fromLocal8Bit(m_instanceName); if (name.isEmpty() && qEnvironmentVariableIsSet(resourceNameVar)) name = QString::fromLocal8Bit(qgetenv(resourceNameVar)); if (name.isEmpty()) |