diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-10 18:15:09 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-10 18:15:09 (GMT) |
| commit | cd4cab01810b817cdf8eb80ab9fc3174a798dd10 (patch) | |
| tree | a849171a850e91851e871544d1e49a56484d37c7 /src/corelib/statemachine/qfinalstate.cpp | |
| parent | d895af5713a7b7ee011b2b29cb5844fbf964df5e (diff) | |
| parent | 7005ca9f0f6b1e535ad2b26d3fcf46dffacc3f13 (diff) | |
| download | Qt-cd4cab01810b817cdf8eb80ab9fc3174a798dd10.zip Qt-cd4cab01810b817cdf8eb80ab9fc3174a798dd10.tar.gz Qt-cd4cab01810b817cdf8eb80ab9fc3174a798dd10.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/gui/styles/qcommonstyle.cpp
tools/assistant/lib/lib.pro
tools/assistant/lib/qhelp_global.cpp
tools/assistant/tools/assistant/assistant.qch
tools/assistant/tools/assistant/mainwindow.cpp
Diffstat (limited to 'src/corelib/statemachine/qfinalstate.cpp')
| -rw-r--r-- | src/corelib/statemachine/qfinalstate.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qfinalstate.cpp b/src/corelib/statemachine/qfinalstate.cpp index 761eee4..d900ddd 100644 --- a/src/corelib/statemachine/qfinalstate.cpp +++ b/src/corelib/statemachine/qfinalstate.cpp @@ -92,6 +92,7 @@ public: }; QFinalStatePrivate::QFinalStatePrivate() + : QAbstractStatePrivate(FinalState) { } |