summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorIan Dean <ian@mediator-software.com>2012-07-18 21:06:53 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-07-20 00:25:13 (GMT)
commita9c50bccd055567340dd6925c92d1dd62b73e143 (patch)
tree9e05e927b067cd8d2347b5ad6660b68eb3b3e6d4 /src/gui
parent7a354169ccafd63a682b0d8bd6b536a7a5b7e821 (diff)
downloadQt-a9c50bccd055567340dd6925c92d1dd62b73e143.zip
Qt-a9c50bccd055567340dd6925c92d1dd62b73e143.tar.gz
Qt-a9c50bccd055567340dd6925c92d1dd62b73e143.tar.bz2
Fix null pointer bug when no QPA event integration is used.
Change-Id: I604c489b9209603346eec23d35444ee1b02bf698 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qeventdispatcher_qpa.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp
index e21fd24..2124bb3 100644
--- a/src/gui/kernel/qeventdispatcher_qpa.cpp
+++ b/src/gui/kernel/qeventdispatcher_qpa.cpp
@@ -124,6 +124,7 @@ public:
selectReturnMutex(0),
selectWorkerNeedsSync(true),
selectWorkerHasResult(false),
+ selectWorker(0),
m_integrationInitialised(false),
m_hasIntegration(false),
m_isEventLoopIntegrationRunning(false)