Commit 2e181127 authored by Erik Verbruggen's avatar Erik Verbruggen
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 397bd2ed 3f6d5a83
......@@ -43,7 +43,6 @@
#define GDBMACROS_P_H
#include <QtCore/QObject>
#include <QtCore/private/qobject_p.h>
#if defined(QT_BEGIN_NAMESPACE)
QT_BEGIN_NAMESPACE
......
......@@ -21,12 +21,13 @@
//#include <QtTest/qtest_gui.h>
#include <QtCore/private/qobject_p.h>
#include "gdb/gdbmi.h"
#include "tcf/json.h"
#include "gdbmacros.h"
#include "gdbmacros_p.h"
#undef NS
#ifdef QT_NAMESPACE
# define STRINGIFY0(s) #s
......
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