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

create bootstrap-dbus module

Browse Source 
this just factors out the common sources from the qdbus tools, to avoid
double compilation, and to clean up the project files.

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

10
src/src.pro
View File

@ -19,13 +19,17 @@ src_tools_qdoc.subdir = tools/qdoc
src_tools_qdoc.target = sub-qdoc
src_tools_qdoc.depends = src_tools_bootstrap
src_tools_bootstrap_dbus.subdir = tools/bootstrap-dbus
src_tools_bootstrap_dbus.target = sub-bootstrap_dbus
src_tools_bootstrap_dbus.depends = src_tools_bootstrap
src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
src_tools_qdbusxml2cpp.depends = src_tools_bootstrap
src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus
src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
src_tools_qdbuscpp2xml.depends = src_tools_bootstrap
src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus
src_winmain.subdir = $$PWD/winmain
src_winmain.target = sub-winmain
@ -97,7 +101,7 @@ SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_corelib
win32:SUBDIRS += src_winmain
SUBDIRS += src_network src_sql src_xml src_testlib
contains(QT_CONFIG, dbus) {
SUBDIRS += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
SUBDIRS += src_dbus src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
contains(QT_CONFIG, accessibility-atspi-bridge): \
src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp
src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml

34
src/tools/bootstrap-dbus/bootstrap-dbus.pro Normal file
View File

@ -0,0 +1,34 @@
option(host_build)
MODULE = bootstrap_dbus
TARGET = QtBootstrapDBus
QT = bootstrap-private
CONFIG += no_module_headers internal_module
!build_pass: CONFIG += release
DEFINES += \
QT_NO_CAST_FROM_ASCII
MODULE_PRIVATE_INCLUDES = \
\$\$QT_MODULE_INCLUDE_BASE/QtDBus \
\$\$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT_VERSION \
\$\$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT_VERSION/QtDBus
load(qt_module)
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
SOURCES = \
../../dbus/qdbusintrospection.cpp \
../../dbus/qdbusxmlparser.cpp \
../../dbus/qdbuserror.cpp \
../../dbus/qdbusutil.cpp \
../../dbus/qdbusmisc.cpp \
../../dbus/qdbusmetatype.cpp \
../../dbus/qdbusargument.cpp \
../../dbus/qdbusextratypes.cpp \
../../dbus/qdbus_symbols.cpp \
../../dbus/qdbusunixfiledescriptor.cpp
lib.CONFIG = dummy_install
INSTALLS = lib

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

@ -1,23 +1,10 @@
option(host_build)
QT += bootstrap_dbus-private
DEFINES += QT_NO_CAST_FROM_ASCII
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
include(../moc/moc.pri)
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
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
SOURCES += qdbuscpp2xml.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbusmetatype.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbusutil.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbusmisc.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbusargument.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbusextratypes.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp
SOURCES += qdbuscpp2xml.cpp
load(qt_tool)

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

@ -1,23 +1,8 @@
option(host_build)
QT += bootstrap_dbus-private
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
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/qdbusextratypes.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \
$$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp
SOURCES = qdbusxml2cpp.cpp
load(qt_tool)