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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggermainwindow.cpp

Change-Id: I07496916dd37b842d57ce5c49f99c079a9095a5f
This commit is contained in:
Orgad Shaneh
2018-09-21 10:48:49 +03:00
parent 525b51edd9 f350c4d1d4
commit 539b10727e
65 changed files with 842 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/helpplugin.cpp
View File

@@ -329,7 +329,7 @@ void HelpPlugin::extensionsInitialized()
{
QStringList filesToRegister;
// we might need to register creators inbuild help
filesToRegister.append(ICore::documentationPath() + "/qtcreator.qch");
filesToRegister.append(Core::HelpManager::documentationPath() + "/qtcreator.qch");
Core::HelpManager::registerDocumentation(filesToRegister);
}