diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-05 08:54:21 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-07-05 08:54:21 +0000 |
| commit | 207253384b69e49db22e9b1cfe472ad0d99a9051 (patch) | |
| tree | d31d1f136509cc1942f308c8bb479f7479131e6e /src/widgets/kernel/qwhatsthis.cpp | |
| parent | 4f7507c52390cd19d76e0f36744f21fbc3e14674 (diff) | |
| parent | c2b224a758ce7e6dcf3748444fa8e29ab81904be (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/kernel/qwhatsthis.cpp')
| -rw-r--r-- | src/widgets/kernel/qwhatsthis.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 4286019717..e2cfebb8a1 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qwhatsthis.h" -#ifndef QT_NO_WHATSTHIS #include "qpointer.h" #include "qapplication.h" #include <private/qguiapplication_p.h> @@ -54,7 +53,6 @@ #include "qtextdocument.h" #include <qpa/qplatformtheme.h> #include "private/qtextdocumentlayout_p.h" -#include "qtoolbutton.h" #include "qdebug.h" #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" @@ -681,5 +679,3 @@ QAction *QWhatsThis::createAction(QObject *parent) QT_END_NAMESPACE #include "qwhatsthis.moc" - -#endif // QT_NO_WHATSTHIS |