diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2024-04-30 14:23:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2024-04-30 14:23:09 +0200 |
| commit | 0f4efacb9118d9146ebf18f90fe59cd1915e0ede (patch) | |
| tree | e167da87c987fdf62b85298655f86ff20e9453a1 /src/libs | |
| parent | 15e56078b697da63575525c1a810a0f79c763e26 (diff) | |
| parent | 289b42aba4a329f77e16fc78dc4ffe0e67226619 (diff) | |
Merge remote-tracking branch 'origin/13.0'
Conflicts:
doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
doc/qtcreator/src/qtcreator-toc.qdoc
Change-Id: Ibea5488fda972321c448c64fad7f657e84d62cdb
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/utils/reloadpromptutils.cpp | 6 | ||||
| -rw-r--r-- | src/libs/utils/tooltip/tooltip.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp index 5257138245..8a07592d3f 100644 --- a/src/libs/utils/reloadpromptutils.cpp +++ b/src/libs/utils/reloadpromptutils.cpp @@ -89,12 +89,10 @@ QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer "Do you want to save it under a different name, or close " "the editor?").arg(QDir::toNativeSeparators(fileName)); QMessageBox box(QMessageBox::Question, title, msg, QMessageBox::NoButton, parent); - QPushButton *close = - box.addButton(Tr::tr("&Close"), QMessageBox::RejectRole); + QPushButton *saveas = box.addButton(Tr::tr("Save &as..."), QMessageBox::ActionRole); + QPushButton *close = box.addButton(Tr::tr("&Close"), QMessageBox::RejectRole); QPushButton *closeAll = box.addButton(Tr::tr("C&lose All"), QMessageBox::RejectRole); - QPushButton *saveas = - box.addButton(Tr::tr("Save &as..."), QMessageBox::ActionRole); QPushButton *save = box.addButton(Tr::tr("&Save"), QMessageBox::AcceptRole); box.setDefaultButton(saveas); diff --git a/src/libs/utils/tooltip/tooltip.cpp b/src/libs/utils/tooltip/tooltip.cpp index 93f4c1d2ff..da11540c08 100644 --- a/src/libs/utils/tooltip/tooltip.cpp +++ b/src/libs/utils/tooltip/tooltip.cpp @@ -288,9 +288,11 @@ void ToolTip::hideTipWithDelay() void ToolTip::hideTipImmediately() { if (m_tip) { - m_tip->close(); - m_tip->deleteLater(); - m_tip = nullptr; + TipLabel *tip = m_tip.data(); + m_tip.clear(); + + tip->close(); + tip->deleteLater(); } m_showTimer.stop(); m_hideDelayTimer.stop(); |