AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert features.treewidget to QT_[REQUIRE_]CONFIG

Browse Source 
Also fix too specific #include on the way

Change-Id: Ieff5f40584ecc5f680f09a8a4b95d5604ff1e940
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Stephan Binner 2017-06-13 21:06:50 +02:00
parent ebe1c953c0
commit 1d8a3d600d
7 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/accessible/itemviews.cpp
View File

@ -43,7 +43,7 @@
#include <qtableview.h>
#include <qlistview.h>
#include <qtreeview.h>
#include <private/qtreewidget_p.h>
#include <private/qtreeview_p.h>
#ifndef QT_NO_ACCESSIBILITY

16
src/widgets/itemviews/itemviews.pri
View File

@ -17,12 +17,9 @@ HEADERS += \
itemviews/qabstractitemdelegate_p.h \
itemviews/qitemdelegate.h \
itemviews/qdirmodel.h \
itemviews/qtreewidget.h \
itemviews/qtreewidget_p.h \
itemviews/qwidgetitemdata_p.h \
itemviews/qitemeditorfactory.h \
itemviews/qitemeditorfactory_p.h \
itemviews/qtreewidgetitemiterator.h \
itemviews/qdatawidgetmapper.h \
itemviews/qstyleditemdelegate.h
@ -36,9 +33,7 @@ SOURCES += \
itemviews/qabstractitemdelegate.cpp \
itemviews/qitemdelegate.cpp \
itemviews/qdirmodel.cpp \
itemviews/qtreewidget.cpp \
itemviews/qitemeditorfactory.cpp \
itemviews/qtreewidgetitemiterator.cpp \
itemviews/qdatawidgetmapper.cpp \
itemviews/qstyleditemdelegate.cpp
}
@ -70,6 +65,17 @@ qtConfig(tablewidget) {
SOURCES += itemviews/qtablewidget.cpp
}
qtConfig(treewidget) {
HEADERS += \
itemviews/qtreewidget.h \
itemviews/qtreewidget_p.h \
itemviews/qtreewidgetitemiterator.h
SOURCES += \
itemviews/qtreewidget.cpp \
itemviews/qtreewidgetitemiterator.cpp
}
HEADERS += \
itemviews/qfileiconprovider.h \
itemviews/qfileiconprovider_p.h \

3
src/widgets/itemviews/qtreewidget.cpp
View File

@ -39,7 +39,6 @@
#include "qtreewidget.h"
#ifndef QT_NO_TREEWIDGET
#include <qheaderview.h>
#include <qpainter.h>
#include <qitemdelegate.h>
@ -3461,5 +3460,3 @@ QT_END_NAMESPACE
#include "moc_qtreewidget.cpp"
#include "moc_qtreewidget_p.cpp"
#endif // QT_NO_TREEWIDGET

7
src/widgets/itemviews/qtreewidget.h
View File

@ -46,11 +46,10 @@
#include <QtCore/qvariant.h>
#include <QtCore/qvector.h>
QT_REQUIRE_CONFIG(treewidget);
QT_BEGIN_NAMESPACE
#ifndef QT_NO_TREEWIDGET
class QTreeWidget;
class QTreeModel;
class QWidgetItemData;
@ -422,8 +421,6 @@ inline void QTreeWidgetItem::setDisabled(bool disabled)
inline bool QTreeWidgetItem::isDisabled() const
{ return !(flags() & Qt::ItemIsEnabled); }
#endif // QT_NO_TREEWIDGET
QT_END_NAMESPACE
#endif // QTREEWIDGET_H

4
src/widgets/itemviews/qtreewidget_p.h
View File

@ -59,7 +59,7 @@
#include <private/qtreeview_p.h>
#include <QtWidgets/qheaderview.h>
#ifndef QT_NO_TREEWIDGET
QT_REQUIRE_CONFIG(treewidget);
QT_BEGIN_NAMESPACE
@ -242,6 +242,4 @@ public:
QT_END_NAMESPACE
#endif // QT_NO_TREEWIDGET
#endif // QTREEWIDGET_P_H

4
src/widgets/itemviews/qtreewidgetitemiterator.cpp
View File

@ -42,8 +42,6 @@
#include "qtreewidget_p.h"
#include "qwidgetitemdata_p.h"
#ifndef QT_NO_TREEWIDGET
QT_BEGIN_NAMESPACE
/*!
@ -453,5 +451,3 @@ void QTreeWidgetItemIteratorPrivate::ensureValidIterator(const QTreeWidgetItem *
*/
QT_END_NAMESPACE
#endif // QT_NO_TREEWIDGET

7
src/widgets/itemviews/qtreewidgetitemiterator.h
View File

@ -43,11 +43,10 @@
#include <QtWidgets/qtwidgetsglobal.h>
#include <QtCore/qscopedpointer.h>
QT_REQUIRE_CONFIG(treewidget);
QT_BEGIN_NAMESPACE
#ifndef QT_NO_TREEWIDGET
class QTreeWidget;
class QTreeWidgetItem;
class QTreeModel;
@ -146,7 +145,5 @@ inline QTreeWidgetItem *QTreeWidgetItemIterator::operator*() const
Q_DECLARE_OPERATORS_FOR_FLAGS(QTreeWidgetItemIterator::IteratorFlags)
QT_END_NAMESPACE
#endif // QT_NO_TREEWIDGET
#endif // QTREEWIDGETITEMITERATOR_H