AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNX: Don't crash if we unplug the primary display.

Browse Source 
The QPA plugin assumes in several places that we have at least
one QScreen.

Even if patching the plugin to support 0 screens, Qt itself crashes
when dereferencing a null paint device while synching the backing
store.

Change-Id: I2ac504a447aff811d6c07ab857340a3433557cdc
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Sergio Martins 2013-01-30 13:58:12 +00:00 committed by The Qt Project
parent 3dc47622a4
commit 29a78d48d0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
View File

@ -42,6 +42,7 @@
#include "qqnxscreeneventhandler.h" #include "qqnxscreeneventhandler.h"
#include "qqnxintegration.h" #include "qqnxintegration.h"
#include "qqnxkeytranslator.h" #include "qqnxkeytranslator.h"
#include "qqnxscreen.h"
#include <QDebug> #include <QDebug>
#include <QGuiApplication> #include <QGuiApplication>
@ -487,9 +488,18 @@ void QQnxScreenEventHandler::handleDisplayEvent(screen_event_t event)
m_qnxIntegration->createDisplay(nativeDisplay, false /* not primary, we assume */); m_qnxIntegration->createDisplay(nativeDisplay, false /* not primary, we assume */);
} }
} else if (!isAttached) { } else if (!isAttached) {
// libscreen display is deactivated, let's remove the QQnxScreen / QScreen // We never remove the primary display, the qpa plugin doesn't support that and it crashes.
qScreenEventDebug() << "removing display"; // To support it, this would be needed:
m_qnxIntegration->removeDisplay(screen); // - Adjust all qnx qpa code which uses screens
// - Make QWidgetBackingStore not dereference a null paint device
// - Create platform resources ( QQnxWindow ) for all QWindow because they would be deleted
// when you delete the screen
if (!screen->isPrimaryScreen()) {
// libscreen display is deactivated, let's remove the QQnxScreen / QScreen
qScreenEventDebug() << "removing display";
m_qnxIntegration->removeDisplay(screen);
}
} }
} }