diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-06 17:41:06 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-06 17:57:12 +0000 |
commit | 71ec67a0fd8aa8d9caab743647c2fdd4385c3e19 (patch) | |
tree | 25f541805067ffaf0d1a6365c19aac7eaf295551 /src/widgets/widgets/qkeysequenceedit.h | |
parent | 03bcf389c0b525919b82a64ab5290189f2994846 (diff) | |
parent | 19dd2ca93b8b95a5e2792b29ed62ea23800fb53e (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/widgets/widgets/qkeysequenceedit.h')
-rw-r--r-- | src/widgets/widgets/qkeysequenceedit.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/widgets/qkeysequenceedit.h b/src/widgets/widgets/qkeysequenceedit.h index 81339a9852..d5b4b199cd 100644 --- a/src/widgets/widgets/qkeysequenceedit.h +++ b/src/widgets/widgets/qkeysequenceedit.h @@ -44,9 +44,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(keysequenceedit); -#ifndef QT_NO_KEYSEQUENCEEDIT +QT_BEGIN_NAMESPACE class QKeySequenceEditPrivate; class Q_WIDGETS_EXPORT QKeySequenceEdit : public QWidget @@ -82,8 +82,6 @@ private: Q_DECLARE_PRIVATE(QKeySequenceEdit) }; -#endif // QT_NO_KEYSEQUENCEEDIT - QT_END_NAMESPACE #endif // QKEYSEQUENCEEDIT_H |