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

fix C++11 string literal incompatibility

Browse Source 
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-22 15:50:49 +01:00
committed by hjk
parent 09f56a5c0d
commit fa66a540fd
9 changed files with 539 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -442,7 +442,7 @@ CdbEngine::CdbEngine(const DebuggerStartParameters &sp,
m_specialStopMode(NoSpecialStop),
m_nextCommandToken(0),
m_currentBuiltinCommandIndex(-1),
m_extensionCommandPrefixBA("!"QT_CREATOR_CDB_EXT"."),
m_extensionCommandPrefixBA("!" QT_CREATOR_CDB_EXT "."),
m_operateByInstructionPending(true),
m_operateByInstruction(true), // Default CDB setting
m_notifyEngineShutdownOnTermination(false),
@@ -573,7 +573,7 @@ QString CdbEngine::extensionLibraryName(bool is64Bit)
// Determine extension lib name and path to use
QString rc;
QTextStream(&rc) << QFileInfo(QCoreApplication::applicationDirPath()).path()
<< "/lib/" << (is64Bit ? QT_CREATOR_CDB_EXT"64" : QT_CREATOR_CDB_EXT"32")
<< "/lib/" << (is64Bit ? QT_CREATOR_CDB_EXT "64" : QT_CREATOR_CDB_EXT "32")
<< '/' << QT_CREATOR_CDB_EXT << ".dll";
return rc;
}