From 578961829a267c8df0931db6618391cb3c3dde99 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 11 Mar 2013 10:32:28 +0100
Subject: normalize #includes

we already have the syncqt'd include paths set, so use them.

Change-Id: I9d0047a79b493dd8b65f0f5495f3592ce2e2fb1d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | 10 +++++-----
 src/tools/qdbuscpp2xml/qdbuscpp2xml.pro |  3 +--
 src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp |  4 ++--
 src/tools/qdbusxml2cpp/qdbusxml2cpp.pro |  3 +--
 4 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
index cdefd5bb37..a66757907d 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -52,8 +52,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "qdbusconnection.h"    // for the Export* flags
-#include "qdbusconnection_p.h"    // for the qDBusCheckAsyncTag
+#include <qdbusconnection.h>    // for the Export* flags
+#include <private/qdbusconnection_p.h>    // for the qDBusCheckAsyncTag
 
 // copied from dbus-protocol.h:
 static const char docTypeHeader[] =
@@ -64,9 +64,9 @@ static const char docTypeHeader[] =
 #define QCLASSINFO_DBUS_INTERFACE       "D-Bus Interface"
 #define QCLASSINFO_DBUS_INTROSPECTION   "D-Bus Introspection"
 
-#include "qdbusmetatype_p.h"
-#include "qdbusmetatype.h"
-#include "qdbusutil_p.h"
+#include <qdbusmetatype.h>
+#include <private/qdbusmetatype_p.h>
+#include <private/qdbusutil_p.h>
 
 #include "moc.h"
 #include "generator.h"
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index 7fac7cfb99..8a5635a8c0 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -7,8 +7,7 @@ DEFINES += QT_NO_CAST_FROM_ASCII
 INCLUDEPATH += $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtDBus \
                    $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \
-                   $$QT_SOURCE_TREE/src/dbus
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus
 
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
 
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
index ce3936c301..e6d77643de 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -48,8 +48,8 @@
 #include <qtextstream.h>
 #include <qset.h>
 
-#include "qdbusmetatype.h"
-#include <qdbusintrospection_p.h>
+#include <qdbusmetatype.h>
+#include <private/qdbusintrospection_p.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index 98f51b3c44..5f05df1133 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -5,8 +5,7 @@ DEFINES += QT_NO_CAST_FROM_ASCII
 INCLUDEPATH += $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtDBus \
                    $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \
-                   $$QT_SOURCE_TREE/src/dbus
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus
 
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
 
-- 
cgit v1.2.3