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

Convert features.tablewidget to QT_[REQUIRE_]CONFIG

Browse Source 
Also fix dependency of cupsjobwidget feature

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

3
src/printsupport/configure.json
View File

@ -40,7 +40,8 @@
"features.combobox", "features.combobox",
"features.cups", "features.cups",
"features.datetimeedit", "features.datetimeedit",
"features.groupbox" "features.groupbox",
"features.tablewidget"
], ],
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },

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

@ -19,8 +19,6 @@ HEADERS += \
itemviews/qdirmodel.h \ itemviews/qdirmodel.h \
itemviews/qlistwidget.h \ itemviews/qlistwidget.h \
itemviews/qlistwidget_p.h \ itemviews/qlistwidget_p.h \
itemviews/qtablewidget.h \
itemviews/qtablewidget_p.h \
itemviews/qtreewidget.h \ itemviews/qtreewidget.h \
itemviews/qtreewidget_p.h \ itemviews/qtreewidget_p.h \
itemviews/qwidgetitemdata_p.h \ itemviews/qwidgetitemdata_p.h \
@ -41,7 +39,6 @@ SOURCES += \
itemviews/qitemdelegate.cpp \ itemviews/qitemdelegate.cpp \
itemviews/qdirmodel.cpp \ itemviews/qdirmodel.cpp \
itemviews/qlistwidget.cpp \ itemviews/qlistwidget.cpp \
itemviews/qtablewidget.cpp \
itemviews/qtreewidget.cpp \ itemviews/qtreewidget.cpp \
itemviews/qitemeditorfactory.cpp \ itemviews/qitemeditorfactory.cpp \
itemviews/qtreewidgetitemiterator.cpp \ itemviews/qtreewidgetitemiterator.cpp \
@ -60,6 +57,14 @@ qtConfig(columnview) {
itemviews/qcolumnviewgrip.cpp itemviews/qcolumnviewgrip.cpp
} }
qtConfig(tablewidget) {
HEADERS += \
itemviews/qtablewidget.h \
itemviews/qtablewidget_p.h
SOURCES += itemviews/qtablewidget.cpp
}
HEADERS += \ HEADERS += \
itemviews/qfileiconprovider.h \ itemviews/qfileiconprovider.h \
itemviews/qfileiconprovider_p.h \ itemviews/qfileiconprovider_p.h \

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

@ -39,7 +39,6 @@
#include "qtablewidget.h" #include "qtablewidget.h"
#ifndef QT_NO_TABLEWIDGET
#include <qitemdelegate.h> #include <qitemdelegate.h>
#include <qpainter.h> #include <qpainter.h>
#include <private/qtablewidget_p.h> #include <private/qtablewidget_p.h>
@ -2715,5 +2714,3 @@ QT_END_NAMESPACE
#include "moc_qtablewidget.cpp" #include "moc_qtablewidget.cpp"
#include "moc_qtablewidget_p.cpp" #include "moc_qtablewidget_p.cpp"
#endif // QT_NO_TABLEWIDGET

8
src/widgets/itemviews/qtablewidget.h
View File

@ -44,13 +44,11 @@
#include <QtWidgets/qtableview.h> #include <QtWidgets/qtableview.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qvector.h> #include <QtCore/qvector.h>
//#include <QtWidgets/qitemselectionmodel.h>
QT_REQUIRE_CONFIG(tablewidget);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_TABLEWIDGET
class Q_WIDGETS_EXPORT QTableWidgetSelectionRange class Q_WIDGETS_EXPORT QTableWidgetSelectionRange
{ {
public: public:
@ -369,8 +367,6 @@ inline void QTableWidgetItem::setSelected(bool aselect)
inline bool QTableWidgetItem::isSelected() const inline bool QTableWidgetItem::isSelected() const
{ return (view ? view->isItemSelected(this) : false); } { return (view ? view->isItemSelected(this) : false); }
#endif // QT_NO_TABLEWIDGET
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QTABLEWIDGET_H #endif // QTABLEWIDGET_H

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

@ -58,7 +58,7 @@
#include <private/qtableview_p.h> #include <private/qtableview_p.h>
#include <private/qwidgetitemdata_p.h> #include <private/qwidgetitemdata_p.h>
#ifndef QT_NO_TABLEWIDGET QT_REQUIRE_CONFIG(tablewidget);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -218,6 +218,4 @@ public:
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_TABLEWIDGET
#endif // QTABLEWIDGET_P_H #endif // QTABLEWIDGET_P_H