Commit b6ad8a0d authored by hjk's avatar hjk

Debugger: Make std:: type simplification accessible from test

Change-Id: I26d9f656dac454c4e4ba51cab9b2120d8138462c
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent a2727b51
......@@ -4,6 +4,16 @@ include(../qttest.pri)
DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
DUMPERDIR = $$IDE_SOURCE_TREE/share/qtcreator/dumper
# To access the std::type rewriter
DEFINES += CPLUSPLUS_BUILD_STATIC_LIB
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri)
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"
SOURCES += \
$$DEBUGGERDIR/debuggerprotocol.cpp \
$$DEBUGGERDIR/watchdata.cpp \
......
......@@ -31,6 +31,8 @@
#include "watchdata.h"
#include "watchutils.h"
#include <CppRewriter.h>
#include <QtTest>
#include <QTemporaryFile>
#include <QTemporaryDir>
......@@ -100,7 +102,8 @@ struct Type
{}
bool matches(const QByteArray &actualType0, const QByteArray &nameSpace) const
{
QByteArray actualType = actualType0;
QByteArray actualType =
CPlusPlus::simplifySTLType(QString::fromLatin1(actualType0)).toLatin1();
actualType.replace(' ', "");
QByteArray expectedType = type;
expectedType.replace(' ', "");
......
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