diff options
author | Stéphane Chatty <chatty@djnn.net> | 2015-02-14 23:59:29 +0100 |
---|---|---|
committer | Stéphane Chatty <chatty@djnn.net> | 2015-02-20 21:28:38 +0000 |
commit | 4af142d4e182f86bbcb486fbfec22f0a3b9e31e7 (patch) | |
tree | c55c1efe2216d112d6fe0b1c8a65ab6f979884af /src/plugins/platforms/xcb | |
parent | f7716a0899fba150fcde29f5b03da06dd284c6be (diff) |
Linux/XCB: added a missing arg to QXcbConnection::QXcbConnection call
QXcbConnection::QXcbConnection has 3 args now, but in the call for
extra X displays it still was used with 2 args. The bug has gone
unnoticed so far because of default args and type conversion.
Change-Id: I48b60ce6da8edb1e564010d2b4af9ae95da25316
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/xcb')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 791f91e054..2e9ba0e8c5 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -170,7 +170,7 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters, int &argc, char qDebug() << "QXcbIntegration: Connecting to additional display: " << parameters.at(i) << parameters.at(i+1); #endif QString display = parameters.at(i) + QLatin1Char(':') + parameters.at(i+1); - m_connections << new QXcbConnection(m_nativeInterface.data(), display.toLatin1().constData()); + m_connections << new QXcbConnection(m_nativeInterface.data(), m_canGrab, display.toLatin1().constData()); } m_fontDatabase.reset(new QGenericUnixFontDatabase()); |