diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-09-04 18:36:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-05 08:12:17 +0200 |
| commit | 356a74042d51b9d12b892bfdfb2e59322a3f9c73 (patch) | |
| tree | 8e416324b68f44b7da9c5c7f66713d785cb22049 | |
| parent | d5d0ecab7806640f34bdb855ea2a8bc684eb5aa9 (diff) | |
| download | qt4-tools-356a74042d51b9d12b892bfdfb2e59322a3f9c73.tar.gz | |
QWizard/Win: Fix vista helper cache state invalidation
If the cached state is not dirty and the instanceCount is zero, when the
instanceCount is incremented the cached state will not be correct. To
fix this, reset the cached state to dirty if the instanceCount is
incremented from zero.
Change-Id: Ic49eef7f83b1289a939f998817b1b2b5f5a2a45f
(cherry picked from commit e5ebcbc6343a5d5d815cbbd1812f1f5791b7bc88)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | src/gui/dialogs/qwizard_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp index bd4301a2aa..13527b1e80 100644 --- a/src/gui/dialogs/qwizard_win.cpp +++ b/src/gui/dialogs/qwizard_win.cpp @@ -244,8 +244,9 @@ QVistaHelper::QVistaHelper(QWizard *wizard) , wizard(wizard) , backButton_(0) { - ++instanceCount; is_vista = resolveSymbols(); + if (instanceCount++ == 0) + cachedVistaState = Dirty; if (is_vista) backButton_ = new QVistaBackButton(wizard); |