summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/widgets/widgets/qkeysequenceedit.cpp4
-rw-r--r--src/widgets/widgets/qkeysequenceedit.h6
-rw-r--r--src/widgets/widgets/qkeysequenceedit_p.h6
-rw-r--r--src/widgets/widgets/widgets.pri11
4 files changed, 12 insertions, 15 deletions
diff --git a/src/widgets/widgets/qkeysequenceedit.cpp b/src/widgets/widgets/qkeysequenceedit.cpp
index 4d86c7cfc7..6f2a6b2d5a 100644
--- a/src/widgets/widgets/qkeysequenceedit.cpp
+++ b/src/widgets/widgets/qkeysequenceedit.cpp
@@ -47,8 +47,6 @@
QT_BEGIN_NAMESPACE
-#ifndef QT_NO_KEYSEQUENCEEDIT
-
Q_STATIC_ASSERT(QKeySequencePrivate::MaxKeyCount == 4); // assumed by the code around here
void QKeySequenceEditPrivate::init()
@@ -332,8 +330,6 @@ void QKeySequenceEdit::timerEvent(QTimerEvent *e)
QWidget::timerEvent(e);
}
-#endif // QT_NO_KEYSEQUENCEEDIT
-
QT_END_NAMESPACE
#include "moc_qkeysequenceedit.cpp"
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
diff --git a/src/widgets/widgets/qkeysequenceedit_p.h b/src/widgets/widgets/qkeysequenceedit_p.h
index 67e60b4032..7af034e735 100644
--- a/src/widgets/widgets/qkeysequenceedit_p.h
+++ b/src/widgets/widgets/qkeysequenceedit_p.h
@@ -58,9 +58,9 @@
#include <private/qwidget_p.h>
#include <private/qkeysequence_p.h>
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(keysequenceedit);
-#ifndef QT_NO_KEYSEQUENCEEDIT
+QT_BEGIN_NAMESPACE
class QLineEdit;
@@ -81,8 +81,6 @@ public:
int releaseTimer;
};
-#endif // QT_NO_KEYSEQUENCEEDIT
-
QT_END_NAMESPACE
#endif // QKEYSEQUENCEEDIT_P_H
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 48d3dd96d5..22847c9783 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -7,8 +7,6 @@ HEADERS += \
widgets/qabstractspinbox_p.h \
widgets/qframe.h \
widgets/qframe_p.h \
- widgets/qkeysequenceedit.h \
- widgets/qkeysequenceedit_p.h \
widgets/qlineedit.h \
widgets/qlineedit_p.h \
widgets/qmainwindow.h \
@@ -45,7 +43,6 @@ SOURCES += \
widgets/qabstractspinbox.cpp \
widgets/qeffects.cpp \
widgets/qframe.cpp \
- widgets/qkeysequenceedit.cpp \
widgets/qlineedit_p.cpp \
widgets/qlineedit.cpp \
widgets/qmainwindow.cpp \
@@ -151,6 +148,14 @@ qtConfig(groupbox) {
SOURCES += widgets/qgroupbox.cpp
}
+qtConfig(keysequenceedit) {
+ HEADERS += \
+ widgets/qkeysequenceedit.h \
+ widgets/qkeysequenceedit_p.h
+
+ SOURCES += widgets/qkeysequenceedit.cpp
+}
+
qtConfig(label) {
HEADERS += \
widgets/qlabel.h \