summaryrefslogtreecommitdiffstats
path: root/src/widgets/itemviews
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2017-06-12 08:44:53 +0200
committerStephan Binner <stephan.binner@basyskom.com>2017-06-29 02:23:52 +0000
commitbf6f91e527e0fec49a8cd82eb4b9a55ff3db6d98 (patch)
tree06e54ef73b85fd34b52486fc4922fd6420091f82 /src/widgets/itemviews
parent63cc734abb7b31a73c60767b9af521783c102bd4 (diff)
Convert features.statustip to QT_CONFIG
Change-Id: Ic719ab93ed1802fcc713885ad0421cb44c7a998b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/itemviews')
-rw-r--r--src/widgets/itemviews/qabstractitemview.cpp6
-rw-r--r--src/widgets/itemviews/qheaderview.cpp4
-rw-r--r--src/widgets/itemviews/qtreewidget.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index e8db228256..c8fdf06d64 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -173,7 +173,7 @@ void QAbstractItemViewPrivate::checkMouseMove(const QPersistentModelIndex &index
if (index.isValid()) {
emit q->entered(index);
-#ifndef QT_NO_STATUSTIP
+#if QT_CONFIG(statustip)
QString statustip = model->data(index, Qt::StatusTipRole).toString();
if (parent && (shouldClearStatusTip || !statustip.isEmpty())) {
QStatusTipEvent tip(statustip);
@@ -182,7 +182,7 @@ void QAbstractItemViewPrivate::checkMouseMove(const QPersistentModelIndex &index
}
#endif
} else {
-#ifndef QT_NO_STATUSTIP
+#if QT_CONFIG(statustip)
if (parent && shouldClearStatusTip) {
QString emptyString;
QStatusTipEvent tip( emptyString );
@@ -1703,7 +1703,7 @@ bool QAbstractItemView::viewportEvent(QEvent *event)
break;
case QEvent::Leave:
d->setHoverIndex(QModelIndex()); // If we've left, no hover should be needed anymore
- #ifndef QT_NO_STATUSTIP
+ #if QT_CONFIG(statustip)
if (d->shouldClearStatusTip && d->parent) {
QString empty;
QStatusTipEvent tip(empty);
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index c31b00959d..6a6991ebb8 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -2664,7 +2664,7 @@ bool QHeaderView::viewportEvent(QEvent *e)
}
break; }
#endif // QT_CONFIG(whatsthis)
-#ifndef QT_NO_STATUSTIP
+#if QT_CONFIG(statustip)
case QEvent::StatusTip: {
QHelpEvent *he = static_cast<QHelpEvent*>(e);
int logical = logicalIndexAt(he->pos());
@@ -2675,7 +2675,7 @@ bool QHeaderView::viewportEvent(QEvent *e)
setStatusTip(statustip);
}
return true; }
-#endif // QT_NO_STATUSTIP
+#endif // QT_CONFIG(statustip)
case QEvent::FontChange:
case QEvent::StyleChange:
d->invalidateCachedSizeHint();
diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h
index d258f76621..3bdeae08d8 100644
--- a/src/widgets/itemviews/qtreewidget.h
+++ b/src/widgets/itemviews/qtreewidget.h
@@ -224,7 +224,7 @@ inline void QTreeWidgetItem::setText(int column, const QString &atext)
inline void QTreeWidgetItem::setIcon(int column, const QIcon &aicon)
{ setData(column, Qt::DecorationRole, aicon); }
-#ifndef QT_NO_STATUSTIP
+#if QT_CONFIG(statustip)
inline void QTreeWidgetItem::setStatusTip(int column, const QString &astatusTip)
{ setData(column, Qt::StatusTipRole, astatusTip); }
#endif