diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-03-08 19:14:07 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-18 14:14:19 +0100 |
commit | 2f534e442344ae02a483608f71602008b593516b (patch) | |
tree | 2b3ff7d718dd0ac6f7169f17bc9d9573d53494a7 /src | |
parent | 2031c822f5834bca88976b0ab79ec329323f1a92 (diff) |
Bootstrap qdbusxml2cpp
Change-Id: I06856b169d5ee4f99fcf9c87ce88cb5ac34568e8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 15 | ||||
-rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 36 | ||||
-rw-r--r-- | src/tools/tools.pro | 8 |
3 files changed, 47 insertions, 12 deletions
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index 26a0f2044e..cc30567543 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include <QtCore/qbytearray.h> -#include <QtCore/qcoreapplication.h> #include <QtCore/qdatetime.h> #include <QtCore/qdebug.h> #include <QtCore/qfile.h> @@ -49,15 +48,14 @@ #include <QtCore/qtextstream.h> #include <QtCore/qset.h> -#include <QtDBus/QtDBus> -#include "private/qdbusmetaobject_p.h" +#include "qdbusmetatype.h" #include "private/qdbusintrospection_p.h" #include <stdio.h> #include <stdlib.h> #define PROGRAMNAME "qdbusxml2cpp" -#define PROGRAMVERSION "0.7" +#define PROGRAMVERSION "0.8" #define PROGRAMCOPYRIGHT "Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)." #define ANNOTATION_NO_WAIT "org.freedesktop.DBus.Method.NoReply" @@ -1110,8 +1108,13 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte int main(int argc, char **argv) { - QCoreApplication app(argc, argv); - parseCmdLine(app.arguments()); + QStringList arguments; + + for (int i = 0; i < argc; ++i) { + arguments.append(QString::fromLocal8Bit(argv[i])); + } + + parseCmdLine(arguments); QDBusIntrospection::Interfaces interfaces = readInput(); cleanInterfaces(interfaces); diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index 2324e2d596..5c430fdfb1 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -1,9 +1,33 @@ -SOURCES = qdbusxml2cpp.cpp -DESTDIR = $$QT.designer.bins +TEMPLATE = app TARGET = qdbusxml2cpp -QT = core dbus-private -CONFIG -= app_bundle -win32:CONFIG += console -target.path=$$[QT_INSTALL_BINS] +DESTDIR = ../../../bin + +INCLUDEPATH += . +DEPENDPATH += . + +include(../bootstrap/bootstrap.pri) + +INCLUDEPATH += $$QT_BUILD_TREE/include \ + $$QT_BUILD_TREE/include/QtDBus \ + $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION \ + $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION/QtDBus \ + $$QT_SOURCE_TREE/src/dbus + +QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS + +SOURCES = qdbusxml2cpp.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbusintrospection.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbusxmlparser.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbuserror.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbusutil.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbusmetatype.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbusargument.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbusmarshaller.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbusextratypes.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \ + $$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp + +target.path = $$[QT_HOST_BINS] INSTALLS += target +load(qt_targets) diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 8c2739a381..23666bd4ef 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc +contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp !contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic # Set subdir and respective target name src_tools_bootstrap.subdir = $$PWD/bootstrap @@ -13,6 +14,10 @@ src_tools_uic.subdir = $$PWD/uic src_tools_uic.target = sub-uic src_tools_qdoc.subdir = $$QT_SOURCE_TREE/src/tools/qdoc src_tools_qdoc.target = sub-qdoc +contains(QT_CONFIG, dbus) { + src_tools_qdbusxml2cpp.subdir = $$QT_SOURCE_TREE/src/tools/qdbusxml2cpp + src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp +} !wince*:!ordered { # Set dependencies for each subdir @@ -20,6 +25,9 @@ src_tools_qdoc.target = sub-qdoc src_tools_rcc.depends = src_tools_bootstrap src_tools_uic.depends = src_tools_bootstrap src_tools_qdoc.depends = src_tools_bootstrap + contains(QT_CONFIG, dbus) { + src_tools_qdbusxml2cpp.depends = src_tools_bootstrap + } } # Special handling, depending on type of project, if it used debug/release or only has one configuration |