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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Conflicts:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
This commit is contained in:
Eike Ziller
2017-05-09 15:07:30 +02:00
parent d571e8d442 3282f85f3d
commit 6e8ee7479e
69 changed files with 475 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/help/localhelpmanager.cpp
View File

@@ -304,10 +304,8 @@ QHelpEngine &LocalHelpManager::helpEngine()
{
if (!m_guiEngine) {
QMutexLocker _(&m_guiMutex);
if (!m_guiEngine) {
if (!m_guiEngine)
m_guiEngine = new QHelpEngine(QString());
m_guiEngine->setAutoSaveFilter(false);
}
}
return *m_guiEngine;
}