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

Convert features.listwidget to QT_[REQUIRE_]CONFIG

Browse Source 
Also fix too specific #includes on the way

Change-Id: Id626928513e89dd4a8854640994661f0d329470b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Stephan Binner 2017-06-13 21:03:57 +02:00
parent a6073d4b30
commit ebe1c953c0
6 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qinputdialog.cpp
View File

@ -48,7 +48,7 @@
#include "qlayout.h"
#include "qlineedit.h"
#include "qplaintextedit.h"
#include "qlistwidget.h"
#include "qlistview.h"
#include "qpushbutton.h"
#include "qspinbox.h"
#include "qstackedlayout.h"

2
src/widgets/dialogs/qsidebar_p.h
View File

@ -52,7 +52,7 @@
//
#include <QtWidgets/private/qtwidgetsglobal_p.h>
#include <qlistwidget.h>
#include <qlistview.h>
#include <qstandarditemmodel.h>
#include <qstyleditemdelegate.h>
#include <qurl.h>

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

@ -17,8 +17,6 @@ HEADERS += \
itemviews/qabstractitemdelegate_p.h \
itemviews/qitemdelegate.h \
itemviews/qdirmodel.h \
itemviews/qlistwidget.h \
itemviews/qlistwidget_p.h \
itemviews/qtreewidget.h \
itemviews/qtreewidget_p.h \
itemviews/qwidgetitemdata_p.h \
@ -38,7 +36,6 @@ SOURCES += \
itemviews/qabstractitemdelegate.cpp \
itemviews/qitemdelegate.cpp \
itemviews/qdirmodel.cpp \
itemviews/qlistwidget.cpp \
itemviews/qtreewidget.cpp \
itemviews/qitemeditorfactory.cpp \
itemviews/qtreewidgetitemiterator.cpp \
@ -57,6 +54,14 @@ qtConfig(columnview) {
itemviews/qcolumnviewgrip.cpp
}
qtConfig(listwidget) {
HEADERS += \
itemviews/qlistwidget.h \
itemviews/qlistwidget_p.h
SOURCES += itemviews/qlistwidget.cpp
}
qtConfig(tablewidget) {
HEADERS += \
itemviews/qtablewidget.h \

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

@ -39,7 +39,6 @@
#include "qlistwidget.h"
#ifndef QT_NO_LISTWIDGET
#include <qitemdelegate.h>
#include <private/qlistview_p.h>
#include <private/qwidgetitemdata_p.h>
@ -1969,5 +1968,3 @@ QT_END_NAMESPACE
#include "moc_qlistwidget.cpp"
#include "moc_qlistwidget_p.cpp"
#endif // QT_NO_LISTWIDGET

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

@ -46,11 +46,10 @@
#include <QtCore/qvector.h>
#include <QtCore/qitemselectionmodel.h>
QT_REQUIRE_CONFIG(listwidget);
QT_BEGIN_NAMESPACE
#ifndef QT_NO_LISTWIDGET
class QListWidget;
class QListModel;
class QWidgetItemData;
@ -329,8 +328,6 @@ inline void QListWidgetItem::setHidden(bool ahide)
inline bool QListWidgetItem::isHidden() const
{ return (view ? view->isItemHidden(this) : false); }
#endif // QT_NO_LISTWIDGET
QT_END_NAMESPACE
#endif // QLISTWIDGET_H

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

@ -58,7 +58,7 @@
#include <private/qlistview_p.h>
#include <private/qwidgetitemdata_p.h>
#ifndef QT_NO_LISTWIDGET
QT_REQUIRE_CONFIG(listwidget);
QT_BEGIN_NAMESPACE
@ -171,6 +171,4 @@ public:
QT_END_NAMESPACE
#endif // QT_NO_LISTWIDGET
#endif // QLISTWIDGET_P_H