diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:41 +0200 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:41 +0200 |
commit | 47f8f0e4a1ac5e36b84002be46dc35249ecb668b (patch) | |
tree | 3b967833500b55ba8bd9660dbac0573616860241 | |
parent | 271acbfc10e878bf5349146b09e771a83f79326d (diff) | |
parent | 03eea4d922a8e85b9cef1ed5a021638bca9dd849 (diff) |
Merge 5.14 into 5.14.1v5.14.1
Change-Id: Ifdc883e859924f743dafd0a9093e9d571917b5fb
-rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 2 |
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; |