summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@nokia.com>2010-07-08 13:27:14 (GMT)
committerSamuli Piippo <samuli.piippo@digia.com>2011-06-09 10:06:31 (GMT)
commitafafb7d61fc7e681a8440c768f1b8f0ea5b91527 (patch)
tree17f03ee70f7db95666c0a54660e27d07cb75ebc9
parent0062e852a5d3cd9c86e308d581621584cd5df6d9 (diff)
downloadQt-afafb7d61fc7e681a8440c768f1b8f0ea5b91527.zip
Qt-afafb7d61fc7e681a8440c768f1b8f0ea5b91527.tar.gz
Qt-afafb7d61fc7e681a8440c768f1b8f0ea5b91527.tar.bz2
Initalize the nativeDialogInUse variable
When the variable was not initalized it would randomly show a native font dialog or a non native one if the DontUseNativeDialogs flag was set. Task-number: QTBUG-12042 Reviewed-by: cduclos (cherry picked from commit c48eb6d5d0a299449330dea8a6a59514942c8781)
-rw-r--r--src/gui/dialogs/qfontdialog.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp
index ff39a5b..6a25e5a 100644
--- a/src/gui/dialogs/qfontdialog.cpp
+++ b/src/gui/dialogs/qfontdialog.cpp
@@ -332,6 +332,7 @@ void QFontDialogPrivate::init()
#ifdef Q_WS_MAC
delegate = 0;
+ nativeDialogInUse = false;
#endif
}