diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-07 17:49:43 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-21 20:35:29 +0200 |
commit | 1c80d056e4f45b4ee7c4863cd792e83c889513c5 (patch) | |
tree | fce424d5dcc18710bd88a479ec48c443209a1115 /src/widgets/widgets | |
parent | fbb7c98e91ec9a0a253864d7621ee7ec73b1a480 (diff) |
Port QT_NO_TOOLTIP to QT_CONFIG(tooltip)
We remove the QT_NO_TOOLTIP check from qstandarditemmodel.h, because as
the 'tooltip' feature is in QtWidgets, we cannot use it properly in
QtGui. Also this affects just two non-virtual inline methods, i.e. it
has no effect on library size.
Task-number: QTBUG-82785
Change-Id: Ic166f14fb1cf3e9dd789573a6b9db6a87fb50e10
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qdockarealayout.cpp | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qmdisubwindow.cpp | 14 | ||||
-rw-r--r-- | src/widgets/widgets/qmenu.cpp | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 12 | ||||
-rw-r--r-- | src/widgets/widgets/qtabbar.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtabbar_p.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtabwidget.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qtabwidget.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtoolbox.cpp | 12 | ||||
-rw-r--r-- | src/widgets/widgets/qtoolbox.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtoolbutton.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 10 | ||||
-rw-r--r-- | src/widgets/widgets/qwidgettextcontrol_p_p.h | 2 |
13 files changed, 45 insertions, 33 deletions
diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp index 87f4519dd6..693692d6c7 100644 --- a/src/widgets/widgets/qdockarealayout.cpp +++ b/src/widgets/widgets/qdockarealayout.cpp @@ -2109,7 +2109,7 @@ bool QDockAreaLayoutInfo::updateTabBar() const quintptr id = tabId(item); if (tab_idx == tabBar->count()) { tabBar->insertTab(tab_idx, title); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) tabBar->setTabToolTip(tab_idx, title); #endif tabBar->setTabData(tab_idx, id); @@ -2119,7 +2119,7 @@ bool QDockAreaLayoutInfo::updateTabBar() const tabBar->removeTab(tab_idx); else { tabBar->insertTab(tab_idx, title); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) tabBar->setTabToolTip(tab_idx, title); #endif tabBar->setTabData(tab_idx, id); @@ -2128,7 +2128,7 @@ bool QDockAreaLayoutInfo::updateTabBar() const if (title != tabBar->tabText(tab_idx)) { tabBar->setTabText(tab_idx, title); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) tabBar->setTabToolTip(tab_idx, title); #endif } diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index f68f46a7f1..ddc11cd470 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -154,7 +154,9 @@ #if QT_CONFIG(whatsthis) #include <QWhatsThis> #endif +#if QT_CONFIG(tooltip) #include <QToolTip> +#endif #if QT_CONFIG(mainwindow) #include <QMainWindow> #endif @@ -290,7 +292,7 @@ static inline bool isHoverControl(QStyle::SubControl control) return control != QStyle::SC_None && control != QStyle::SC_TitleBarLabel; } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) static void showToolTip(QHelpEvent *helpEvent, QWidget *widget, const QStyleOptionComplex &opt, QStyle::ComplexControl complexControl, QStyle::SubControl subControl) { @@ -355,7 +357,7 @@ static void showToolTip(QHelpEvent *helpEvent, QWidget *widget, const QStyleOpti const QRect rect = widget->style()->subControlRect(complexControl, &opt, subControl, widget); QToolTip::showText(helpEvent->globalPos(), toolTip, widget, rect); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) namespace QMdi { /* @@ -416,7 +418,7 @@ bool ControlLabel::event(QEvent *event) updateWindowIcon(); setFixedSize(label.size()); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) else if (event->type() == QEvent::ToolTip) { QStyleOptionTitleBar options; options.initFrom(this); @@ -673,14 +675,14 @@ void ControllerWidget::leaveEvent(QEvent * /*event*/) */ bool ControllerWidget::event(QEvent *event) { -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) if (event->type() == QEvent::ToolTip) { QStyleOptionComplex opt; initStyleOption(&opt); QHelpEvent *helpEvent = static_cast<QHelpEvent *>(event); showToolTip(helpEvent, this, opt, QStyle::CC_MdiControls, getSubControl(helpEvent->pos())); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) return QWidget::event(event); } @@ -2874,7 +2876,7 @@ bool QMdiSubWindow::event(QEvent *event) case QEvent::FontChange: d->font = font(); break; -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) case QEvent::ToolTip: showToolTip(static_cast<QHelpEvent *>(event), this, d->titleBarOptions(), QStyle::CC_TitleBar, d->hoveredSubControl); diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 86bc3d69be..0aca290484 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -73,7 +73,9 @@ #include "qtoolbutton.h" #endif #include "qpushbutton.h" +#if QT_CONFIG(tooltip) #include "qtooltip.h" +#endif #include <qwindow.h> #include <private/qpushbutton_p.h> #include <private/qaction_p.h> @@ -3029,7 +3031,7 @@ QMenu::event(QEvent *e) if (d->currentAction) d->popupAction(d->currentAction, 0, false); break; -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) case QEvent::ToolTip: if (d->toolTipsVisible) { const QHelpEvent *ev = static_cast<const QHelpEvent*>(e); @@ -3041,7 +3043,7 @@ QMenu::event(QEvent *e) } } break; -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) #if QT_CONFIG(whatsthis) case QEvent::QueryWhatsThis: e->setAccepted(d->whatsThis.size()); diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 57339ebd74..670cdeb345 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -52,7 +52,9 @@ #if QT_CONFIG(tabwidget) #include "qtabwidget.h" #endif +#if QT_CONFIG(tooltip) #include "qtooltip.h" +#endif #if QT_CONFIG(whatsthis) #include "qwhatsthis.h" #endif @@ -1280,7 +1282,7 @@ void QTabBar::setTabIcon(int index, const QIcon & icon) } } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) /*! Sets the tool tip of the tab at position \a index to \a tip. */ @@ -1302,7 +1304,7 @@ QString QTabBar::tabToolTip(int index) const return tab->toolTip; return QString(); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) #if QT_CONFIG(whatsthis) /*! @@ -1711,7 +1713,7 @@ bool QTabBar::event(QEvent *event) update(oldHoverRect); return true; } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) case QEvent::ToolTip: if (const QTabBarPrivate::Tab *tab = d->at(tabAt(static_cast<QHelpEvent*>(event)->pos()))) { if (!tab->toolTip.isEmpty()) { @@ -1720,7 +1722,7 @@ bool QTabBar::event(QEvent *event) } } break; -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) #if QT_CONFIG(whatsthis) case QEvent::QEvent::QueryWhatsThis: { const QTabBarPrivate::Tab *tab = d->at(d->indexAtPos(static_cast<QHelpEvent*>(event)->pos())); @@ -2785,7 +2787,7 @@ CloseButton::CloseButton(QWidget *parent) #ifndef QT_NO_CURSOR setCursor(Qt::ArrowCursor); #endif -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) setToolTip(tr("Close Tab")); #endif resize(sizeHint()); diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index 0cf331b6ab..cf98834853 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -120,7 +120,7 @@ public: Qt::TextElideMode elideMode() const; void setElideMode(Qt::TextElideMode mode); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) void setTabToolTip(int index, const QString &tip); QString tabToolTip(int index) const; #endif diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index ac4cbd32a8..63a80d687c 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -117,7 +117,7 @@ public: bool visible; int shortcutId; QString text; -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) QString toolTip; #endif #if QT_CONFIG(whatsthis) diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index 8885610e26..115a557e52 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -1209,7 +1209,7 @@ int QTabWidget::count() const return d->tabs->count(); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) /*! Sets the tab tool tip for the page at position \a index to \a tip. @@ -1232,7 +1232,7 @@ QString QTabWidget::tabToolTip(int index) const Q_D(const QTabWidget); return d->tabs->tabToolTip(index); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) #if QT_CONFIG(whatsthis) /*! diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index ceec3f8dd8..b61a02bdc6 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -91,7 +91,7 @@ public: QIcon tabIcon(int index) const; void setTabIcon(int index, const QIcon & icon); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) void setTabToolTip(int index, const QString & tip); QString tabToolTip(int index) const; #endif diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp index 5500104afb..57d26bb6ee 100644 --- a/src/widgets/widgets/qtoolbox.cpp +++ b/src/widgets/widgets/qtoolbox.cpp @@ -47,7 +47,9 @@ #include <qscrollarea.h> #include <qstyle.h> #include <qstyleoption.h> +#if QT_CONFIG(tooltip) #include <qtooltip.h> +#endif #include <qabstractbutton.h> #include <private/qmemory_p.h> @@ -96,7 +98,7 @@ public: inline void setText(const QString &text) { button->setText(text); } inline void setIcon(const QIcon &is) { button->setIcon(is); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) inline void setToolTip(const QString &tip) { button->setToolTip(tip); } inline QString toolTip() const { return button->toolTip(); } #endif @@ -638,7 +640,7 @@ void QToolBox::setItemIcon(int index, const QIcon &icon) c->setIcon(icon); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) /*! Sets the tooltip of the item at position \a index to \a toolTip. */ @@ -650,7 +652,7 @@ void QToolBox::setItemToolTip(int index, const QString &toolTip) if (c) c->setToolTip(toolTip); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) /*! Returns \c true if the item at position \a index is enabled; otherwise returns \c false. @@ -687,7 +689,7 @@ QIcon QToolBox::itemIcon(int index) const return (c ? c->icon() : QIcon()); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) /*! Returns the tooltip of the item at position \a index, or an empty string if \a index is out of range. @@ -699,7 +701,7 @@ QString QToolBox::itemToolTip(int index) const const QToolBoxPrivate::Page *c = d->page(index); return (c ? c->toolTip() : QString()); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) /*! \reimp */ void QToolBox::showEvent(QShowEvent *e) diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index 2796631b94..d12d4dcfec 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -76,7 +76,7 @@ public: void setItemIcon(int index, const QIcon &icon); QIcon itemIcon(int index) const; -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) void setItemToolTip(int index, const QString &toolTip); QString itemToolTip(int index) const; #endif diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 410c326d51..e8cb502650 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -49,7 +49,9 @@ #include <qpointer.h> #include <qstyle.h> #include <qstyleoption.h> +#if QT_CONFIG(tooltip) #include <qtooltip.h> +#endif #if QT_CONFIG(mainwindow) #include <qmainwindow.h> #endif @@ -944,7 +946,7 @@ void QToolButton::setDefaultAction(QAction *action) buttonText.replace(QLatin1String("&"), QLatin1String("&&")); setText(buttonText); setIcon(action->icon()); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) setToolTip(action->toolTip()); #endif #if QT_CONFIG(statustip) diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 41932214c1..e32f779bb0 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -84,7 +84,9 @@ #include <qurl.h> #include <qdesktopservices.h> #include <qinputmethod.h> +#if QT_CONFIG(tooltip) #include <qtooltip.h> +#endif #include <qstyleoption.h> #if QT_CONFIG(lineedit) #include <QtWidgets/qlineedit.h> @@ -1074,13 +1076,13 @@ void QWidgetTextControl::processEvent(QEvent *e, const QTransform &transform, QW d->isEnabled = e->isAccepted(); break; -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) case QEvent::ToolTip: { QHelpEvent *ev = static_cast<QHelpEvent *>(e); d->showToolTip(ev->globalPos(), transform.map(ev->pos()), contextWidget); break; } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) #if QT_CONFIG(draganddrop) case QEvent::DragEnter: { @@ -2948,7 +2950,7 @@ void QWidgetTextControlPrivate::activateLinkUnderCursor(QString href) emit q_func()->linkActivated(href); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) void QWidgetTextControlPrivate::showToolTip(const QPoint &globalPos, const QPointF &pos, QWidget *contextWidget) { const QString toolTip = q_func()->cursorForPosition(pos).charFormat().toolTip(); @@ -2956,7 +2958,7 @@ void QWidgetTextControlPrivate::showToolTip(const QPoint &globalPos, const QPoin return; QToolTip::showText(globalPos, toolTip, contextWidget); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) bool QWidgetTextControlPrivate::isPreediting() const { diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h index c77a31bedf..7304b15106 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h @@ -171,7 +171,7 @@ public: void activateLinkUnderCursor(QString href = QString()); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) void showToolTip(const QPoint &globalPos, const QPointF &pos, QWidget *contextWidget); #endif |