diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:19:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-04 16:05:53 +0200 |
| commit | c2b224a758ce7e6dcf3748444fa8e29ab81904be (patch) | |
| tree | 277cb99bf054190c935579142506caa4ec9861dd /src/widgets/dialogs/qwizard.cpp | |
| parent | 10de063ff12cdba07b4620182aced8ed05ee3505 (diff) | |
| parent | eaee1209f0ead5be786e81db8aee604ccfea85b0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qprocess_unix.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/util/util.pri
tests/auto/corelib/thread/qthread/qthread.pro
tests/auto/corelib/thread/qthread/tst_qthread.cpp
Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b
Diffstat (limited to 'src/widgets/dialogs/qwizard.cpp')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index c272511aae..7bb72a00b7 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -40,8 +40,6 @@ #include "qwizard.h" #include <QtWidgets/private/qtwidgetsglobal_p.h> -#ifndef QT_NO_WIZARD - #include "qabstractspinbox.h" #include "qalgorithms.h" #include "qapplication.h" @@ -3986,5 +3984,3 @@ QWizard *QWizardPage::wizard() const QT_END_NAMESPACE #include "moc_qwizard.cpp" - -#endif // QT_NO_WIZARD |