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

CDB: Fix module names in Qt 5.

Browse Source 
Library naming convention was changed.
Increase version.

Change-Id: I01a7e49f6ffb0e4e78c25f9d9e117a2100dc7784
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-12-13 10:49:13 +01:00
committed by hjk
parent 0877f4e254
commit 8c8e7b4cbc
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -686,15 +686,20 @@ const QtInfo &QtInfo::get(const SymbolGroupValueContext &ctx)
// Lookup qstrdup() to hopefully get module (potential libinfix) and namespace
// Typically, this resolves to 'QtGuid4!qstrdup' and 'QtCored4!qstrdup'...
const std::string qualifiedSymbol = resolveQtSymbol("qstrdup", "QtCored", "Core", ctx);
const std::string::size_type libPos = qualifiedSymbol.find("Core");
const std::string::size_type exclPos = qualifiedSymbol.find('!'); // Resolved: 'QtCored4!qstrdup'
if (exclPos == std::string::npos) {
if (libPos == std::string::npos || exclPos == std::string::npos) {
rc.libInfix = "d4";
rc.version = 4;
break;
}
// Should be 'QtCored4!qstrdup'
rc.libInfix = qualifiedSymbol.substr(6, exclPos - 6);
rc.version = qualifiedSymbol.at(exclPos - 1) - '0';
rc.libInfix = qualifiedSymbol.substr(libPos + 4, exclPos - libPos - 4);
// 'Qt5Cored!qstrdup' or 'QtCored4!qstrdup'.
if (isdigit(qualifiedSymbol.at(2))) {
rc.version = qualifiedSymbol.at(2) - '0';
} else {
rc.version = qualifiedSymbol.at(exclPos - 1) - '0';
}
// Any namespace? 'QtCored4!nsp::qstrdup'
const std::string::size_type nameSpaceStart = exclPos + 1;
const std::string::size_type colonPos = qualifiedSymbol.find(':', nameSpaceStart);
@@ -716,8 +721,13 @@ std::string QtInfo::moduleName(Module m) const
{
// Must match the enumeration
static const char* modNames[] =
{"QtCore", "QtGui", "QtWidgets", "QtNetwork", "QtScript" };
return modNames[m] + libInfix;
{"Core", "Gui", "Widgets", "Network", "Script" };
std::ostringstream result;
result << "Qt";
if (version >= 5)
result << version;
result << modNames[m] << libInfix;
return result.str();
}
std::string QtInfo::prependModuleAndNameSpace(const std::string &type,