AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

normalize #includes

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

Change-Id: I9d0047a79b493dd8b65f0f5495f3592ce2e2fb1d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-03-11 10:32:28 +01:00 committed by The Qt Project
parent ef6cf8ce72
commit 578961829a
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
View File

@ -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"

3
src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
View File

@ -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

4
src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
View File

@ -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>

3
src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
View File

@ -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