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/qdockarealayout.cpp | |
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/qdockarealayout.cpp')
-rw-r--r-- | src/widgets/widgets/qdockarealayout.cpp | 6 |
1 files changed, 3 insertions, 3 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 } |