diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-02 21:31:36 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-04 00:52:42 +0200 |
| commit | 911516e1d3045a0c10f46a5a64abf6ce26d374b3 (patch) | |
| tree | da3700b2028c7bcae7a6d13f2cfadfcee7332727 | |
| parent | ff0a759f8d70322d348e0d918248e56dae2e40d3 (diff) | |
add ability to pass command line options to qdbusxml2cpp
QDBUSXML2CPP_{INTERFACES,ADAPTORS}_{HEADER,SOURCE}_FLAGS are now
understood.
Change-Id: I26492cec5ecb7ff4a6b83755ee8a0c17859b2a68
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| -rw-r--r-- | mkspecs/features/dbuscommon.pri | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/features/dbuscommon.pri b/mkspecs/features/dbuscommon.pri index b2c62306aa..2f7ae8e81d 100644 --- a/mkspecs/features/dbuscommon.pri +++ b/mkspecs/features/dbuscommon.pri @@ -21,8 +21,11 @@ for(entry, $$list($$unique($${GROUP}S))) { } # funny indent to avoid re-indentation in next commit + hdr_flags = $$eval(QDBUSXML2CPP_$${dbus_TYPE}_HEADER_FLAGS) + src_flags = $$eval(QDBUSXML2CPP_$${dbus_TYPE}_SOURCE_FLAGS) + dthc = $${group}_header.commands - $$dthc = $$QMAKE_QDBUSXML2CPP $$qdbusxml2cpp_option ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN} + $$dthc = $$QMAKE_QDBUSXML2CPP $$hdr_flags $$qdbusxml2cpp_option ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN} dtho = $${group}_header.output $$dtho = ${QMAKE_FUNC_FILE_IN_qdbusOutputBasename}_$${dbus_type}.h dthn = $${group}_header.name @@ -33,7 +36,7 @@ for(entry, $$list($$unique($${GROUP}S))) { $$dthi = $$input_list dtsc = $${group}_source.commands - $$dtsc = $$QMAKE_QDBUSXML2CPP -i ${QMAKE_FILE_OUT_BASE}.h $$qdbusxml2cpp_option :${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} + $$dtsc = $$QMAKE_QDBUSXML2CPP -i ${QMAKE_FILE_OUT_BASE}.h $$src_flags $$qdbusxml2cpp_option :${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} dtso = $${group}_source.output $$dtso = ${QMAKE_FUNC_FILE_IN_qdbusOutputBasename}_$${dbus_type}.cpp dtsn = $${group}_source.name |