Commit 5a5d4641 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Debugger: Make manual CCDB test compile again.

parent dbb1c5ef
...@@ -29,8 +29,9 @@ ...@@ -29,8 +29,9 @@
#include "corebreakpoint.h" #include "corebreakpoint.h"
#include "coreengine.h" #include "coreengine.h"
#include "dbgwinutils.h" #ifndef TEST_COMPILE // Usage in manual tests
# include "dbgwinutils.h"
#endif
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
...@@ -246,6 +247,9 @@ Q_GLOBAL_STATIC(NormalizedFileCache, normalizedFileNameCache) ...@@ -246,6 +247,9 @@ Q_GLOBAL_STATIC(NormalizedFileCache, normalizedFileNameCache)
QString BreakPoint::normalizeFileName(const QString &f) QString BreakPoint::normalizeFileName(const QString &f)
{ {
#ifdef TEST_COMPILE // Usage in manual tests
return f;
#else
QTC_ASSERT(!f.isEmpty(), return f) QTC_ASSERT(!f.isEmpty(), return f)
const NormalizedFileCache::const_iterator it = normalizedFileNameCache()->constFind(f); const NormalizedFileCache::const_iterator it = normalizedFileNameCache()->constFind(f);
if (it != normalizedFileNameCache()->constEnd()) if (it != normalizedFileNameCache()->constEnd())
...@@ -256,6 +260,7 @@ QString BreakPoint::normalizeFileName(const QString &f) ...@@ -256,6 +260,7 @@ QString BreakPoint::normalizeFileName(const QString &f)
normalizedName[0] = normalizedName.at(0).toUpper(); normalizedName[0] = normalizedName.at(0).toUpper();
normalizedFileNameCache()->insert(f, normalizedName); normalizedFileNameCache()->insert(f, normalizedName);
return normalizedName; return normalizedName;
#endif
} }
void BreakPoint::clearNormalizeFileNameCache() void BreakPoint::clearNormalizeFileNameCache()
......
...@@ -7,11 +7,14 @@ CONFIG += console ...@@ -7,11 +7,14 @@ CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
TEMPLATE = app TEMPLATE = app
DEFINES += TEST_COMPILE
# -- Add CDB core engine # -- Add CDB core engine
CDB_CORE = ../../../src/plugins/debugger/cdb CDB_CORE = ../../../src/plugins/debugger/cdb
include($$CDB_CORE/cdbcore.pri) include($$CDB_CORE/cdbcore.pri)
INCLUDEPATH *= $$CDB_CORE INCLUDEPATH *= $$CDB_CORE
include(../../../qtcreator.pri)
# -- Add creator 'utils' lib # -- Add creator 'utils' lib
CREATOR_LIB_LIB = ../../../lib/qtcreator CREATOR_LIB_LIB = ../../../lib/qtcreator
LIBS *= -L$$CREATOR_LIB_LIB LIBS *= -L$$CREATOR_LIB_LIB
......
...@@ -9,11 +9,6 @@ preprocessor \ ...@@ -9,11 +9,6 @@ preprocessor \
subdir_proparser \ subdir_proparser \
trklauncher trklauncher
win32 {
# Uses CDB debugger
SUBDIRS += ccdb
}
unix { unix {
# Uses popen # Uses popen
SUBDIRS += \ SUBDIRS += \
......
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