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

Convert features.resizehandler to QT_[REQUIRE_]CONFIG

Browse Source 
Change-Id: I44ed1be0cf56daf7dc2a7e4bbd3402419a04a530
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Stephan Binner 2017-08-27 19:11:11 +02:00
parent dab49434d8
commit 8a93f50695
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/widgets/widgets/qwidgetresizehandler.cpp
View File

@ -39,7 +39,6 @@
#include "qwidgetresizehandler_p.h" #include "qwidgetresizehandler_p.h"
#ifndef QT_NO_RESIZEHANDLER
#include "qframe.h" #include "qframe.h"
#include "qapplication.h" #include "qapplication.h"
#include "qdesktopwidget.h" #include "qdesktopwidget.h"
@ -543,5 +542,3 @@ void QWidgetResizeHandler::doMove()
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qwidgetresizehandler_p.cpp" #include "moc_qwidgetresizehandler_p.cpp"
#endif //QT_NO_RESIZEHANDLER

4
src/widgets/widgets/qwidgetresizehandler_p.h
View File

@ -55,7 +55,7 @@
#include "QtCore/qobject.h" #include "QtCore/qobject.h"
#include "QtCore/qpoint.h" #include "QtCore/qpoint.h"
#ifndef QT_NO_RESIZEHANDLER QT_REQUIRE_CONFIG(resizehandler);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -135,6 +135,4 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_RESIZEHANDLER
#endif // QWIDGETRESIZEHANDLER_P_H #endif // QWIDGETRESIZEHANDLER_P_H

7
src/widgets/widgets/widgets.pri
View File

@ -28,7 +28,6 @@ HEADERS += \
widgets/qtoolbarseparator_p.h \ widgets/qtoolbarseparator_p.h \
widgets/qabstractscrollarea.h \ widgets/qabstractscrollarea.h \
widgets/qabstractscrollarea_p.h \ widgets/qabstractscrollarea_p.h \
widgets/qwidgetresizehandler_p.h \
widgets/qfocusframe.h \ widgets/qfocusframe.h \
widgets/qwidgetanimator_p.h \ widgets/qwidgetanimator_p.h \
widgets/qwidgetlinecontrol_p.h \ widgets/qwidgetlinecontrol_p.h \
@ -56,7 +55,6 @@ SOURCES += \
widgets/qtoolbarlayout.cpp \ widgets/qtoolbarlayout.cpp \
widgets/qtoolbarseparator.cpp \ widgets/qtoolbarseparator.cpp \
widgets/qabstractscrollarea.cpp \ widgets/qabstractscrollarea.cpp \
widgets/qwidgetresizehandler.cpp \
widgets/qfocusframe.cpp \ widgets/qfocusframe.cpp \
widgets/qwidgetanimator.cpp \ widgets/qwidgetanimator.cpp \
widgets/qwidgetlinecontrol.cpp \ widgets/qwidgetlinecontrol.cpp \
@ -200,6 +198,11 @@ qtConfig(radiobutton) {
widgets/qradiobutton.cpp widgets/qradiobutton.cpp
} }
qtConfig(resizehandler) {
HEADERS += widgets/qwidgetresizehandler_p.h
SOURCES += widgets/qwidgetresizehandler.cpp
}
qtConfig(dialogbuttonbox) { qtConfig(dialogbuttonbox) {
HEADERS += \ HEADERS += \
widgets/qdialogbuttonbox.h widgets/qdialogbuttonbox.h