diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-02 19:15:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-04 00:52:38 +0200 |
| commit | ff0a759f8d70322d348e0d918248e56dae2e40d3 (patch) | |
| tree | 1ae68fcd067a211904ea2335da94e7b5f4e10dea /mkspecs/features/dbusinterfaces.prf | |
| parent | 55662549485be9b47984d4a54e730f531fb01f4a (diff) | |
| download | qtbase-ff0a759f8d70322d348e0d918248e56dae2e40d3.tar.gz | |
de-duplicate dbusadaptors.prf vs. dbusinterfaces.prf
it's two times the same code, once with "adaptor" (and an -a option) and
once with "interface" (and a -p option).
the de-duplicated code looks a bit nasty, as qmake cannot deal with
braces on the LHS yet.
Change-Id: I199a07947661ab9abe7a736b56c437f3f6dc4fa4
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'mkspecs/features/dbusinterfaces.prf')
| -rw-r--r-- | mkspecs/features/dbusinterfaces.prf | 44 |
1 files changed, 3 insertions, 41 deletions
diff --git a/mkspecs/features/dbusinterfaces.prf b/mkspecs/features/dbusinterfaces.prf index 1828802a44..910dace359 100644 --- a/mkspecs/features/dbusinterfaces.prf +++ b/mkspecs/features/dbusinterfaces.prf @@ -1,42 +1,4 @@ -load(moc) +dbus_type = interface +qdbusxml2cpp_option = -p -qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp) - -for(DBUS_INTERFACE, $$list($$unique(DBUS_INTERFACES))) { - - !contains(DBUS_INTERFACE, .*\\w\\.xml$) { - warning("Invalid D-BUS interface : '$${DBUS_INTERFACE}', please use 'com.mydomain.myinterface.xml' instead.") - next() - } - - DBUS_INTERFACE_LIST += $${DBUS_INTERFACE} -} - -dbus_interface_header.commands = $$QMAKE_QDBUSXML2CPP -p ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN} -dbus_interface_header.output_function = dbus_interface_header_output -dbus_interface_header.name = DBUSXML2CPP INTERFACE HEADER ${QMAKE_FILE_IN} -dbus_interface_header.variable_out = DBUS_INTERFACE_HEADERS -dbus_interface_header.input = DBUS_INTERFACE_LIST - -defineReplace(dbus_interface_header_output) { - return("$$lower($$section($$list($$basename(1)),.,-2,-2))_interface.h") -} - -dbus_interface_source.commands = $$QMAKE_QDBUSXML2CPP -i ${QMAKE_FILE_OUT_BASE}.h -p :${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} -dbus_interface_source.output_function = dbus_interface_source_output -dbus_interface_source.name = DBUSXML2CPP INTERFACE SOURCE ${QMAKE_FILE_IN} -dbus_interface_source.variable_out = SOURCES -dbus_interface_source.input = DBUS_INTERFACE_LIST - -dbus_interface_moc.commands = $$moc_header.commands -dbus_interface_moc.output = $$moc_header.output -dbus_interface_moc.depends = $$dbus_interface_header.output -dbus_interface_moc.input = DBUS_INTERFACE_HEADERS -dbus_interface_moc.variable_out = GENERATED_SOURCES -dbus_interface_moc.name = $$moc_header.name - -defineReplace(dbus_interface_source_output) { - return("$$lower($$section($$list($$basename(1)),.,-2,-2))_interface.cpp") -} - -QMAKE_EXTRA_COMPILERS += dbus_interface_header dbus_interface_source dbus_interface_moc +include(dbuscommon.pri) |