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

2009-08-06 12:37:28 +02:00
parent 397bd2ed24 3f6d5a83a8
commit 2e1811275e
2 changed files with 2 additions and 2 deletions
--- a/share/qtcreator/gdbmacros/gdbmacros_p.h
+++ b/share/qtcreator/gdbmacros/gdbmacros_p.h
@@ -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
--- a/tests/auto/debugger/main.cpp
+++ b/tests/auto/debugger/main.cpp
@@ -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