summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:08:41 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:08:41 +0200
commit47f8f0e4a1ac5e36b84002be46dc35249ecb668b (patch)
tree3b967833500b55ba8bd9660dbac0573616860241
parent271acbfc10e878bf5349146b09e771a83f79326d (diff)
parent03eea4d922a8e85b9cef1ed5a021638bca9dd849 (diff)
Merge 5.14 into 5.14.1v5.14.1
-rw-r--r--src/activeqt/control/qaxserverbase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index 4fb5ef3..dd64a33 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -408,7 +408,7 @@ private:
QPointer<QMenuBar> menuBar;
QPointer<QStatusBar> statusBar;
QPointer<QMenu> currentPopup;
- QAxExceptInfo *exception;
+ QAxExceptInfo *exception = nullptr;
CRITICAL_SECTION refCountSection;
CRITICAL_SECTION createWindowSection;