diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-13 20:42:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-19 19:54:44 +0200 |
| commit | d0ba4f5386548a5830c782343790ab42cc089df9 (patch) | |
| tree | fd8b9cf525d70b663d9fa10c54cd8cbfeca35af1 /mkspecs | |
| parent | cae8951e3085e50f7dd48b592940fa0ccd97bb59 (diff) | |
remove now unnecessary indirections
qmake's new parser can deal with this much more readable code.
Change-Id: I772c9da4c9d049e2b332305f41496ed1196f60eb
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/dbuscommon.pri | 45 | ||||
| -rw-r--r-- | mkspecs/features/incredibuild_xge.prf | 3 |
2 files changed, 16 insertions, 32 deletions
diff --git a/mkspecs/features/dbuscommon.pri b/mkspecs/features/dbuscommon.pri index 1e02225fd3..fce2d04967 100644 --- a/mkspecs/features/dbuscommon.pri +++ b/mkspecs/features/dbuscommon.pri @@ -45,38 +45,23 @@ for(group, groups) { src_flags = $$eval($${grp}.source_flags) } - dthc = $${group}_header.commands - $$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 - $$dthn = DBUSXML2CPP $${dbus_TYPE} HEADER ${QMAKE_FILE_IN} - dthvo = $${group}_header.variable_out - $$dthvo = $${GROUP}_HEADERS - dthi = $${group}_header.input - $$dthi = $$input_list + $${group}_header.commands = $$QMAKE_QDBUSXML2CPP $$hdr_flags $$qdbusxml2cpp_option ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN} + $${group}_header.output = ${QMAKE_FUNC_FILE_IN_qdbusOutputBasename}_$${dbus_type}.h + $${group}_header.name = DBUSXML2CPP $${dbus_TYPE} HEADER ${QMAKE_FILE_IN} + $${group}_header.variable_out = $${GROUP}_HEADERS + $${group}_header.input = $$input_list - dtsc = $${group}_source.commands - $$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 - $$dtsn = DBUSXML2CPP $${dbus_TYPE} SOURCE ${QMAKE_FILE_IN} - dtsvo = $${group}_source.variable_out - $$dtsvo = SOURCES - dtsi = $${group}_source.input - $$dtsi = $$input_list + $${group}_source.commands = $$QMAKE_QDBUSXML2CPP -i ${QMAKE_FILE_OUT_BASE}.h $$src_flags $$qdbusxml2cpp_option :${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} + $${group}_source.output = ${QMAKE_FUNC_FILE_IN_qdbusOutputBasename}_$${dbus_type}.cpp + $${group}_source.name = DBUSXML2CPP $${dbus_TYPE} SOURCE ${QMAKE_FILE_IN} + $${group}_source.variable_out = SOURCES + $${group}_source.input = $$input_list - dtmc = $${group}_moc.commands - $$dtmc = $$moc_header.commands - dtmo = $${group}_moc.output - $$dtmo = $$moc_header.output - dtmi = $${group}_moc.input - $$dtmi = $${GROUP}_HEADERS - dtmvo = $${group}_moc.variable_out - $$dtmvo = GENERATED_SOURCES - dtmn = $${group}_moc.name - $$dtmn = $$moc_header.name + $${group}_moc.commands = $$moc_header.commands + $${group}_moc.output = $$moc_header.output + $${group}_moc.input = $${GROUP}_HEADERS + $${group}_moc.variable_out = GENERATED_SOURCES + $${group}_moc.name = $$moc_header.name QMAKE_EXTRA_COMPILERS += $${group}_header $${group}_source $${group}_moc } diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf index 1b23da75d9..028f39d7b6 100644 --- a/mkspecs/features/incredibuild_xge.prf +++ b/mkspecs/features/incredibuild_xge.prf @@ -6,7 +6,6 @@ contains(TEMPLATE, "vc.*") { win32-msvc2*|wince*msvc*: EOC = $$escape_expand(\\r\\h) for(xge, INCREDIBUILD_XGE) { - xgevar = $${xge}.commands - $$xgevar = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$shell_path($${xge}.output) $$EOC $$eval($${xge}.commands) + $${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$shell_path($${xge}.output) $$EOC $$eval($${xge}.commands) } } |