1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert features.keysequenceedit to QT_[REQUIRE_]CONFIG

Browse Source 
Change-Id: Id8ffd7f0e6ef4bdc43959179c26342ecee75b280
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Stephan Binner 2017-08-27 19:08:58 +02:00
parent ced0f54ec3
commit 135da45318
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/widgets/qkeysequenceedit.cpp
View File

@ -47,8 +47,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_KEYSEQUENCEEDIT
Q_STATIC_ASSERT(QKeySequencePrivate::MaxKeyCount == 4); // assumed by the code around here Q_STATIC_ASSERT(QKeySequencePrivate::MaxKeyCount == 4); // assumed by the code around here
void QKeySequenceEditPrivate::init() void QKeySequenceEditPrivate::init()
@ -332,8 +330,6 @@ void QKeySequenceEdit::timerEvent(QTimerEvent *e)
QWidget::timerEvent(e); QWidget::timerEvent(e);
} }
#endif // QT_NO_KEYSEQUENCEEDIT
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qkeysequenceedit.cpp" #include "moc_qkeysequenceedit.cpp"

6
src/widgets/widgets/qkeysequenceedit.h
View File

@ -44,9 +44,9 @@
#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qtwidgetsglobal.h>
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>
QT_BEGIN_NAMESPACE QT_REQUIRE_CONFIG(keysequenceedit);
#ifndef QT_NO_KEYSEQUENCEEDIT QT_BEGIN_NAMESPACE
class QKeySequenceEditPrivate; class QKeySequenceEditPrivate;
class Q_WIDGETS_EXPORT QKeySequenceEdit : public QWidget class Q_WIDGETS_EXPORT QKeySequenceEdit : public QWidget
@ -82,8 +82,6 @@ private:
Q_DECLARE_PRIVATE(QKeySequenceEdit) Q_DECLARE_PRIVATE(QKeySequenceEdit)
}; };
#endif // QT_NO_KEYSEQUENCEEDIT
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QKEYSEQUENCEEDIT_H #endif // QKEYSEQUENCEEDIT_H

6
src/widgets/widgets/qkeysequenceedit_p.h
View File

@ -58,9 +58,9 @@
#include <private/qwidget_p.h> #include <private/qwidget_p.h>
#include <private/qkeysequence_p.h> #include <private/qkeysequence_p.h>
QT_BEGIN_NAMESPACE QT_REQUIRE_CONFIG(keysequenceedit);
#ifndef QT_NO_KEYSEQUENCEEDIT QT_BEGIN_NAMESPACE
class QLineEdit; class QLineEdit;
@ -81,8 +81,6 @@ public:
int releaseTimer; int releaseTimer;
}; };
#endif // QT_NO_KEYSEQUENCEEDIT
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QKEYSEQUENCEEDIT_P_H #endif // QKEYSEQUENCEEDIT_P_H

11
src/widgets/widgets/widgets.pri
View File

@ -7,8 +7,6 @@ HEADERS += \
widgets/qabstractspinbox_p.h \ widgets/qabstractspinbox_p.h \
widgets/qframe.h \ widgets/qframe.h \
widgets/qframe_p.h \ widgets/qframe_p.h \
widgets/qkeysequenceedit.h \
widgets/qkeysequenceedit_p.h \
widgets/qlineedit.h \ widgets/qlineedit.h \
widgets/qlineedit_p.h \ widgets/qlineedit_p.h \
widgets/qmainwindow.h \ widgets/qmainwindow.h \
@ -45,7 +43,6 @@ SOURCES += \
widgets/qabstractspinbox.cpp \ widgets/qabstractspinbox.cpp \
widgets/qeffects.cpp \ widgets/qeffects.cpp \
widgets/qframe.cpp \ widgets/qframe.cpp \
widgets/qkeysequenceedit.cpp \
widgets/qlineedit_p.cpp \ widgets/qlineedit_p.cpp \
widgets/qlineedit.cpp \ widgets/qlineedit.cpp \
widgets/qmainwindow.cpp \ widgets/qmainwindow.cpp \
@ -151,6 +148,14 @@ qtConfig(groupbox) {
SOURCES += widgets/qgroupbox.cpp SOURCES += widgets/qgroupbox.cpp
} }
qtConfig(keysequenceedit) {
HEADERS += \
widgets/qkeysequenceedit.h \
widgets/qkeysequenceedit_p.h
SOURCES += widgets/qkeysequenceedit.cpp
}
qtConfig(label) { qtConfig(label) {
HEADERS += \ HEADERS += \
widgets/qlabel.h \ widgets/qlabel.h \