diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-03 16:07:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-03 16:08:02 +0200 |
| commit | 49db3a450a6d15ae0327b8e3713920ac19320972 (patch) | |
| tree | 309c83eb1dbb6321845d6a1db8fbc49428b20340 /src/plugins/cpptools/cpptoolseditorsupport.cpp | |
| parent | afd56bd8ada761b87c40d80a07cd3b3766b2d2f8 (diff) | |
| parent | d030a960a0e6e1dda89e20b60e5252842fe83f49 (diff) | |
| download | qt-creator-49db3a450a6d15ae0327b8e3713920ac19320972.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/cppeditor/cppeditor.cpp
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
src/plugins/texteditor/basetexteditor.cpp
Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index b3650711d9..1217b874eb 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -138,11 +138,13 @@ CppEditorSupport::CppEditorSupport(CppModelManager *modelManager, BaseTextEditor } m_updateDocumentTimer = new QTimer(this); + m_updateDocumentTimer->setObjectName(QLatin1String("CppEditorSupport::m_updateDocumentTimer")); m_updateDocumentTimer->setSingleShot(true); m_updateDocumentTimer->setInterval(m_updateDocumentInterval); connect(m_updateDocumentTimer, SIGNAL(timeout()), this, SLOT(updateDocumentNow())); m_updateEditorTimer = new QTimer(this); + m_updateEditorTimer->setObjectName(QLatin1String("CppEditorSupport::m_updateEditorTimer")); m_updateEditorTimer->setInterval(UpdateEditorInterval); m_updateEditorTimer->setSingleShot(true); connect(m_updateEditorTimer, SIGNAL(timeout()), @@ -162,6 +164,7 @@ CppEditorSupport::CppEditorSupport(CppModelManager *modelManager, BaseTextEditor connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)), this, SLOT(onCurrentEditorChanged())); m_editorGCTimer = new QTimer(this); + m_editorGCTimer->setObjectName(QLatin1String("CppEditorSupport::m_editorGCTimer")); m_editorGCTimer->setSingleShot(true); m_editorGCTimer->setInterval(EditorHiddenGCTimeout); connect(m_editorGCTimer, SIGNAL(timeout()), this, SLOT(releaseResources())); |