summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbmain.cpp
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@qt.io>2018-10-14 19:46:20 +0200
committerGatis Paeglis <gatis.paeglis@qt.io>2018-10-14 18:38:07 +0000
commita880780ff962dc31be24b508f811c1a2fd0b0f36 (patch)
tree18b4f892bc0daaa16177d3909b578a3a1ccbc5f6 /src/plugins/platforms/xcb/qxcbmain.cpp
parent3af4b59e8b59c7b658c925e1f644d31b89e39896 (diff)
Revert "XCB: Do not create instance of QPlatformIntegration for invalid displays"
This reverts commit 67cc8fea106c35c7ca75bf476667d07b3bbf3257. I forgot about this patch and now it makes rebasing the local changes too time-consuming. Besides, 67cc8fea10 broke a build for -no-xcb-xlib. I will restore this patch, with adaptations to the new QXcb*Connection hierarchy. Task-number: QTBUG-68859 Change-Id: I938f32b5da22ce18f95d761f9b34e77fff923e24 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbmain.cpp')
-rw-r--r--src/plugins/platforms/xcb/qxcbmain.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/platforms/xcb/qxcbmain.cpp b/src/plugins/platforms/xcb/qxcbmain.cpp
index 539d033ca9..f8cb9a9269 100644
--- a/src/plugins/platforms/xcb/qxcbmain.cpp
+++ b/src/plugins/platforms/xcb/qxcbmain.cpp
@@ -52,16 +52,10 @@ public:
QPlatformIntegration* QXcbIntegrationPlugin::create(const QString& system, const QStringList& parameters, int &argc, char **argv)
{
- if (!system.compare(QLatin1String("xcb"), Qt::CaseInsensitive)) {
- QXcbIntegration *xcbIntegration = new QXcbIntegration(parameters, argc, argv);
- if (!xcbIntegration->hasDefaultConnection()) {
- delete xcbIntegration;
- return nullptr;
- }
- return xcbIntegration;
- }
+ if (!system.compare(QLatin1String("xcb"), Qt::CaseInsensitive))
+ return new QXcbIntegration(parameters, argc, argv);
- return nullptr;
+ return 0;
}
QT_END_NAMESPACE