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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75
This commit is contained in:
Eike Ziller
2016-02-24 10:08:37 +01:00
parent eaffeb081e 80d93ab52a
commit 74cdce071f
18 changed files with 108 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
View File

@@ -648,14 +648,16 @@ const QtInfo &QtInfo::get(const SymbolGroupValueContext &ctx)
std::string moduleName;
std::string::size_type exclPos = std::string::npos;
std::string::size_type libPos = std::string::npos;
std::string::size_type qtPos = std::string::npos;
const StringList &modules = SymbolGroupValue::getAllModuleNames(ctx);
for (StringListConstIt module = modules.begin(), total = modules.end();
module != total; ++module) {
moduleName = *module;
if (moduleName.find("Qt") != std::string::npos) {
qtPos = moduleName.find("Qt");
if (qtPos != std::string::npos) {
libPos = moduleName.find("Core");
if (libPos != std::string::npos)
if (libPos != std::string::npos && (libPos - qtPos) < 4)
break;
}
}