diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:19:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-04 16:05:53 +0200 |
| commit | c2b224a758ce7e6dcf3748444fa8e29ab81904be (patch) | |
| tree | 277cb99bf054190c935579142506caa4ec9861dd /src/widgets/itemviews/qtablewidget.h | |
| parent | 10de063ff12cdba07b4620182aced8ed05ee3505 (diff) | |
| parent | eaee1209f0ead5be786e81db8aee604ccfea85b0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qprocess_unix.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/util/util.pri
tests/auto/corelib/thread/qthread/qthread.pro
tests/auto/corelib/thread/qthread/tst_qthread.cpp
Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b
Diffstat (limited to 'src/widgets/itemviews/qtablewidget.h')
| -rw-r--r-- | src/widgets/itemviews/qtablewidget.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index 092ce77306..9c231d5127 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -44,12 +44,10 @@ #include <QtWidgets/qtableview.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> -//#include <QtWidgets/qitemselectionmodel.h> - -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(tablewidget); -#ifndef QT_NO_TABLEWIDGET +QT_BEGIN_NAMESPACE class Q_WIDGETS_EXPORT QTableWidgetSelectionRange { @@ -118,7 +116,7 @@ public: inline void setToolTip(const QString &toolTip); #endif -#ifndef QT_NO_WHATSTHIS +#if QT_CONFIG(whatsthis) inline QString whatsThis() const { return data(Qt::WhatsThisRole).toString(); } inline void setWhatsThis(const QString &whatsThis); @@ -198,7 +196,7 @@ inline void QTableWidgetItem::setToolTip(const QString &atoolTip) { setData(Qt::ToolTipRole, atoolTip); } #endif -#ifndef QT_NO_WHATSTHIS +#if QT_CONFIG(whatsthis) inline void QTableWidgetItem::setWhatsThis(const QString &awhatsThis) { setData(Qt::WhatsThisRole, awhatsThis); } #endif @@ -379,8 +377,6 @@ inline void QTableWidgetItem::setSelected(bool aselect) inline bool QTableWidgetItem::isSelected() const { return (view ? view->isItemSelected(this) : false); } -#endif // QT_NO_TABLEWIDGET - QT_END_NAMESPACE #endif // QTABLEWIDGET_H |