diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:45:32 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:45:32 (GMT) |
| commit | 1898c46452beae9e28cf9be7851099b4b4d2779e (patch) | |
| tree | 00477e689bf1bd867fb3428476029b47817a9db8 /src/gui/dialogs/qwizard.cpp | |
| parent | f15b8a83e2e51955776a3f07cb85ebfc342dd8ef (diff) | |
| parent | 4d5a5149b716c67f031a3a40e23370f90542c92f (diff) | |
| download | Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.zip Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.tar.gz Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachine
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/gui/dialogs/qwizard.cpp')
| -rw-r--r-- | src/gui/dialogs/qwizard.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp index fcd8ccf..32395c4 100644 --- a/src/gui/dialogs/qwizard.cpp +++ b/src/gui/dialogs/qwizard.cpp @@ -516,6 +516,7 @@ public: , vistaInitPending(false) , vistaState(QVistaHelper::Dirty) , vistaStateChanged(false) + , inHandleAeroStyleChange(false) #endif , minimumWidth(0) , minimumHeight(0) @@ -617,6 +618,7 @@ public: bool vistaInitPending; QVistaHelper::VistaState vistaState; bool vistaStateChanged; + bool inHandleAeroStyleChange; #endif int minimumWidth; int minimumHeight; @@ -1459,6 +1461,10 @@ void QWizardPrivate::handleAeroStyleChange() { Q_Q(QWizard); + if (inHandleAeroStyleChange) + return; // prevent recursion + inHandleAeroStyleChange = true; + vistaHelper->backButton()->disconnect(); q->removeEventFilter(vistaHelper); @@ -1493,6 +1499,8 @@ void QWizardPrivate::handleAeroStyleChange() if (q->isVisible()) vistaHelper->setWindowPosHack(); + + inHandleAeroStyleChange = false; } #endif |