From bc60289c41ca5a069e7a0845f2ff1b3ab107d544 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Tue, 27 Mar 2012 22:28:12 -0500
Subject: Avoid space between parenthesis and control statement => unbreak Jom

Jom doesn't handle that extra space, so avoid it.
(Yes, Jom should be fixed too)

Change-Id: Ie78b0830832cb88f7a3d96ea9bc63769111f03dc
---
 .../declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro  | 2 +-
 .../qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro  | 2 +-
 tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro   | 4 ++--
 tests/auto/declarative/qdeclarativemoduleplugin/qmldir_copier.pri     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro
index df0712e7..f8ad3ed2 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro
@@ -17,7 +17,7 @@ copyFoo.input = FOO_IN_FILE
 copyFoo.output = $$FOO_OUT_FILE
 !contains(TEMPLATE_PREFIX, vc):copyFoo.variable_out = PRE_TARGETDEPS
 win32 {
-    copyFoo.commands = ( $$QMAKE_CHK_DIR_EXISTS $$FOO_OUT_DIR $(MKDIR) $$FOO_OUT_DIR ) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copyFoo.commands = ($$QMAKE_CHK_DIR_EXISTS $$FOO_OUT_DIR $(MKDIR) $$FOO_OUT_DIR) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 } else {
     copyFoo.commands = $(MKDIR) $$FOO_OUT_DIR && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 }
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
index b9472bdc..f23a872d 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
@@ -17,7 +17,7 @@ copyMyQmlFile.input = QML_IN_FILE
 copyMyQmlFile.output = $$QML_OUT_FILE
 !contains(TEMPLATE_PREFIX, vc):copyMyQmlFile.variable_out = PRE_TARGETDEPS
 win32 {
-    copyMyQmlFile.commands = ( $$QMAKE_CHK_DIR_EXISTS $$QML_OUT_DIR $(MKDIR) $$QML_OUT_DIR ) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copyMyQmlFile.commands = ($$QMAKE_CHK_DIR_EXISTS $$QML_OUT_DIR $(MKDIR) $$QML_OUT_DIR) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 } else {
     copyMyQmlFile.commands = $(MKDIR) $$QML_OUT_DIR && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 }
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro
index 0be2608b..f1e98a24 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro
@@ -17,7 +17,7 @@ copyComponentA.input = COMPONENTA_IN_FILE
 copyComponentA.output = $$COMPONENTA_OUT_FILE
 !contains(TEMPLATE_PREFIX, vc):copyComponentA.variable_out = PRE_TARGETDEPS
 win32 {
-    copyComponentA.commands = ( $$QMAKE_CHK_DIR_EXISTS $$COMPONENTA_OUT_DIR $(MKDIR) $$COMPONENTA_OUT_DIR ) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copyComponentA.commands = ($$QMAKE_CHK_DIR_EXISTS $$COMPONENTA_OUT_DIR $(MKDIR) $$COMPONENTA_OUT_DIR) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 } else {
     copyComponentA.commands = $(MKDIR) $$COMPONENTA_OUT_DIR && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 }
@@ -37,7 +37,7 @@ copyComponentB.input = COMPONENTB_IN_FILE
 copyComponentB.output = $$COMPONENTB_OUT_FILE
 !contains(TEMPLATE_PREFIX, vc):copyComponentB.variable_out = PRE_TARGETDEPS
 win32 {
-    copyComponentB.commands = ( $$QMAKE_CHK_DIR_EXISTS $$COMPONENTB_OUT_DIR $(MKDIR) $$COMPONENTB_OUT_DIR ) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copyComponentB.commands = ($$QMAKE_CHK_DIR_EXISTS $$COMPONENTB_OUT_DIR $(MKDIR) $$COMPONENTB_OUT_DIR) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 } else {
     copyComponentB.commands = $(MKDIR) $$COMPONENTB_OUT_DIR && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 }
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/qmldir_copier.pri b/tests/auto/declarative/qdeclarativemoduleplugin/qmldir_copier.pri
index 034919fa..3eb7fad8 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/qmldir_copier.pri
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/qmldir_copier.pri
@@ -8,7 +8,7 @@ copy2build.input = COPY_IN_FILE
 copy2build.output = $$COPY_OUT_FILE
 !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
 win32 {
-    copy2build.commands = ( $$QMAKE_CHK_DIR_EXISTS $$COPY_OUT_DIR $(MKDIR) $$COPY_OUT_DIR ) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copy2build.commands = ($$QMAKE_CHK_DIR_EXISTS $$COPY_OUT_DIR $(MKDIR) $$COPY_OUT_DIR) && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 } else {
     copy2build.commands = $(MKDIR) $$COPY_OUT_DIR && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 }
-- 
cgit v1.2.3