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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
This commit is contained in:
Oswald Buddenhagen
2013-08-21 14:39:18 +02:00
parent bf69b4c444 01b3e1fa54
commit c2e90c360b
92 changed files with 5811 additions and 1686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -245,7 +245,7 @@ ModelManager::ModelManager(QObject *parent):
connect(m_updateCppQmlTypesTimer, SIGNAL(timeout()), SLOT(startCppQmlTypeUpdate()));
m_asyncResetTimer = new QTimer(this);
m_asyncResetTimer->setInterval(1000);
m_asyncResetTimer->setInterval(15000);
m_asyncResetTimer->setSingleShot(true);
connect(m_asyncResetTimer, SIGNAL(timeout()), SLOT(resetCodeModel()));