feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compilation with Qt 5.3

Browse Source 
Functor override for QTimer::singleShow was introduced in 5.4

Change-Id: I8970c73a1d4b97c6cc588cddca8d617fdaa8bfa2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-11-08 19:09:16 +02:00
committed by Christian Stenger
parent c725271970
commit c00e69acbc
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/debugger/debuggertooltipmanager.cpp
View File

@@ -1060,7 +1060,7 @@ void DebuggerToolTipManager::registerEngine(DebuggerEngine *)
loadSessionData();
}
void slotUpdateVisibleToolTips()
void DebuggerToolTipManager::slotUpdateVisibleToolTips()
{
purgeClosedToolTips();
if (m_tooltips.isEmpty())
@@ -1239,7 +1239,7 @@ static void slotEditorOpened(IEditor *e)
if (BaseTextEditor *textEditor = qobject_cast<BaseTextEditor *>(e)) {
TextEditorWidget *widget = textEditor->editorWidget();
QObject::connect(widget->verticalScrollBar(), &QScrollBar::valueChanged,
slotUpdateVisibleToolTips);
&DebuggerToolTipManager::slotUpdateVisibleToolTips);
QObject::connect(widget, &TextEditorWidget::tooltipOverrideRequested,
slotTooltipOverrideRequested);
}
@@ -1253,14 +1253,15 @@ void DebuggerToolTipManager::debugModeEntered()
QWidget *topLevel = ICore::mainWindow()->topLevelWidget();
topLevel->installEventFilter(this);
EditorManager *em = EditorManager::instance();
connect(em, &EditorManager::currentEditorChanged, slotUpdateVisibleToolTips);
connect(em, &EditorManager::currentEditorChanged,
&DebuggerToolTipManager::slotUpdateVisibleToolTips);
connect(em, &EditorManager::editorOpened, slotEditorOpened);
foreach (IEditor *e, DocumentModel::editorsForOpenedDocuments())
slotEditorOpened(e);
// Position tooltips delayed once all the editor placeholder layouting is done.
if (!m_tooltips.isEmpty())
QTimer::singleShot(0, slotUpdateVisibleToolTips);
QTimer::singleShot(0, this, SLOT(slotUpdateVisibleToolTips()));
}
}

5
src/plugins/debugger/debuggertooltipmanager.h
View File

@@ -72,7 +72,7 @@ typedef QList<DebuggerToolTipContext> DebuggerToolTipContexts;
class DebuggerToolTipManager : public QObject
{
Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerToolTipManager)
Q_OBJECT
public:
DebuggerToolTipManager();
@@ -100,6 +100,9 @@ public:
static void loadSessionData();
static void saveSessionData();
static void closeAllToolTips();
public slots:
static void slotUpdateVisibleToolTips();
};
} // namespace Internal