****************************************************************************/
#include <QtCore/qbytearray.h>
-#include <QtCore/qcoreapplication.h>
#include <QtCore/qdatetime.h>
#include <QtCore/qdebug.h>
#include <QtCore/qfile.h>
#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"
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);
-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)
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
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
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