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/dbusadaptors.prf | |
| parent | 55662549485be9b47984d4a54e730f531fb01f4a (diff) | |
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/dbusadaptors.prf')
| -rw-r--r-- | mkspecs/features/dbusadaptors.prf | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/mkspecs/features/dbusadaptors.prf b/mkspecs/features/dbusadaptors.prf index 3463d586dd..43134e2a39 100644 --- a/mkspecs/features/dbusadaptors.prf +++ b/mkspecs/features/dbusadaptors.prf @@ -1,41 +1,4 @@ -qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp) +dbus_type = adaptor +qdbusxml2cpp_option = -a -for(DBUS_ADAPTOR, $$list($$unique(DBUS_ADAPTORS))) { - - !contains(DBUS_ADAPTOR, .*\\w\\.xml$) { - warning("Invalid D-BUS adaptor: '$${DBUS_ADAPTOR}', please use 'com.mydomain.myinterface.xml' instead.") - next() - } - - DBUS_ADAPTOR_LIST += $${DBUS_ADAPTOR} -} - -dbus_adaptor_header.commands = $$QMAKE_QDBUSXML2CPP -a ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN} -dbus_adaptor_header.output_function = dbus_adaptor_header_output -dbus_adaptor_header.name = DBUSXML2CPP ADAPTOR HEADER ${QMAKE_FILE_IN} -dbus_adaptor_header.variable_out = DBUS_ADAPTOR_HEADERS -dbus_adaptor_header.input = DBUS_ADAPTOR_LIST - -defineReplace(dbus_adaptor_header_output) { - return("$$lower($$section($$list($$basename(1)),.,-2,-2))_adaptor.h") -} - -dbus_adaptor_source.commands = $$QMAKE_QDBUSXML2CPP -i ${QMAKE_FILE_OUT_BASE}.h -a :${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} -dbus_adaptor_source.output_function = dbus_adaptor_source_output -dbus_adaptor_source.name = DBUSXML2CPP ADAPTOR SOURCE ${QMAKE_FILE_IN} -dbus_adaptor_source.variable_out = SOURCES -dbus_adaptor_source.input = DBUS_ADAPTOR_LIST - -load(moc) -dbus_adaptor_moc.commands = $$moc_header.commands -dbus_adaptor_moc.output = $$moc_header.output -dbus_adaptor_moc.depends = $$dbus_adaptor_header.output -dbus_adaptor_moc.input = DBUS_ADAPTOR_HEADERS -dbus_adaptor_moc.variable_out = GENERATED_SOURCES -dbus_adaptor_moc.name = $$moc_header.name - -defineReplace(dbus_adaptor_source_output) { - return("$$lower($$section($$list($$basename(1)),.,-2,-2))_adaptor.cpp") -} - -QMAKE_EXTRA_COMPILERS += dbus_adaptor_header dbus_adaptor_source dbus_adaptor_moc +include(dbuscommon.pri) |