Commit 3045a733 authored by hjk's avatar hjk

Deubugger: Compile fix for CDB dumper test

Change-Id: I943703df8cfcf804f4310f89ac4c73061927d4d4
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent e1b2d22c
......@@ -7,9 +7,6 @@ win32-msvc* {
CDBEXT_PATH = $$IDE_BUILD_TREE\\$$IDE_LIBRARY_BASENAME
# replace '\' with '\\'
DEFINES += CDBEXT_PATH=\"\\\"$$replace(CDBEXT_PATH, \\\\, \\\\)\\\"\"
} else {
# empty string
DEFINES += CDBEXT_PATH=\"\\\"\\\"\"
}
QT = core network
......
......@@ -145,6 +145,11 @@ static bool generateEnvironmentSettings(Utils::Environment &env,
return true;
}
#ifndef CDBEXT_PATH
#define CDBEXT_PATH ""
#endif
static void setupCdb(QString *makeBinary, QProcessEnvironment *environment)
{
QByteArray envBat = qgetenv("QTC_MSVC_ENV_BAT");
......@@ -153,7 +158,7 @@ static void setupCdb(QString *makeBinary, QProcessEnvironment *environment)
QVERIFY(generateEnvironmentSettings(env, QString::fromLatin1(envBat), QString(), envPairs));
for (QMap<QString,QString>::const_iterator envIt = envPairs.begin(); envIt != envPairs.end(); ++envIt)
env.set(envIt.key(), envIt.value());
const QByteArray cdbextPath = QByteArray(CDBEXT_PATH) + QByteArray("\\qtcreatorcdbext64");
const QByteArray cdbextPath = CDBEXT_PATH "\\qtcreatorcdbext64";
QVERIFY(QFile::exists(QString::fromLatin1(cdbextPath + QByteArray("\\qtcreatorcdbext.dll"))));
env.appendOrSet(QLatin1String("_NT_DEBUGGER_EXTENSION_PATH"),
QString::fromLatin1(cdbextPath),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment