Convert features.undoview to QT_[REQUIRE_]CONFIG

Change-Id: Ic2945b9317f074301acd88602e3dae45e28b7c87
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
bb10
Stephan Binner 2017-06-13 21:09:48 +02:00
parent 1d8a3d600d
commit 769769a2ec
3 changed files with 8 additions and 10 deletions

View File

@ -40,8 +40,6 @@
#include "qundostack.h"
#include "qundoview.h"
#ifndef QT_NO_UNDOVIEW
#include "qundogroup.h"
#include <QtCore/qabstractitemmodel.h>
#include <QtCore/qpointer.h>
@ -473,5 +471,3 @@ QT_END_NAMESPACE
#include "qundoview.moc"
#include "moc_qundoview.cpp"
#endif // QT_NO_UNDOVIEW

View File

@ -44,7 +44,7 @@
#include <QtWidgets/qlistview.h>
#include <QtCore/qstring.h>
#ifndef QT_NO_UNDOVIEW
QT_REQUIRE_CONFIG(undoview);
QT_BEGIN_NAMESPACE
@ -92,5 +92,4 @@ private:
QT_END_NAMESPACE
#endif // QT_NO_UNDOVIEW
#endif // QUNDOVIEW_H

View File

@ -8,16 +8,14 @@ HEADERS += \
util/qsystemtrayicon_p.h \
util/qundogroup.h \
util/qundostack.h \
util/qundostack_p.h \
util/qundoview.h
util/qundostack_p.h
SOURCES += \
util/qsystemtrayicon.cpp \
util/qcolormap.cpp \
util/qcompleter.cpp \
util/qundogroup.cpp \
util/qundostack.cpp \
util/qundoview.cpp
util/qundostack.cpp
qtConfig(scroller) {
HEADERS += \
@ -33,6 +31,11 @@ qtConfig(scroller) {
util/qflickgesture.cpp \
}
qtConfig(undoview) {
HEADERS += util/qundoview.h
SOURCES += util/qundoview.cpp
}
win32:!winrt {
SOURCES += util/qsystemtrayicon_win.cpp
} else: qtConfig(xcb) {