Fix architecture conditions

The actual variable that contains the architecture is
TEST_architecture_arch. TEST_architecture only contains the value
if the test was performed or not.

Fix the conversion script and all the generated files.

Change-Id: Icb3480832cab894948f4fef03b8bc8187cab6152
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

8 files changed, 8 insertions, 8 deletions

diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt
index e0e069d322..25ca44ddbf 100644
--- a/src/concurrent/CMakeLists.txt
+++ b/src/concurrent/CMakeLists.txt
@@ -36,7 +36,7 @@ add_qt_module(Concurrent
 ## Scopes:
 #####################################################################
 
-extend_target(Concurrent CONDITION MSVC AND (TEST_architecture STREQUAL "i386")
+extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x66000000"
 )
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index e1d827d0ee..2059ec6f0c 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -366,7 +366,7 @@ endif()
 #    # MODULE_DEFINES = "QT_NAMESPACE=$$QT_NAMESPACE"
 #)
 
-extend_target(Core CONDITION MSVC AND (TEST_architecture STREQUAL "i386")
+extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x67000000"
 )
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index d429ce9a8a..6a8bdb2d31 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -529,7 +529,7 @@ extend_target(Gui CONDITION GCC AND QT_GCC_MAJOR_VERSION___equals___5
 #### Keys ignored in scope 43:.:painting/painting.pri:NOT APPLE_UIKIT AND NOT WIN32 AND QT_ARCH___contains___arm:
 # CONFIG = "no_clang_integrated_as"
 
-extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT (TEST_architecture STREQUAL "arm64")
+extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT (TEST_architecture_arch  STREQUAL "arm64")
     DEFINES
         ENABLE_PIXMAN_DRAWHELPERS
 )
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index bfcf89bad2..b5a3088018 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -68,7 +68,7 @@ add_qt_module(Network
 ## Scopes:
 #####################################################################
 
-extend_target(Network CONDITION MSVC AND (TEST_architecture STREQUAL "i386")
+extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x64000000"
 )
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 5999e2a63b..acc4cdda9a 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -42,7 +42,7 @@ add_qt_module(OpenGL
 ## Scopes:
 #####################################################################
 
-extend_target(OpenGL CONDITION MSVC AND (TEST_architecture STREQUAL "i386")
+extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x63000000"
 )
diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index 8581f80d01..d438b78446 100644
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -35,7 +35,7 @@ add_qt_module(Sql
 ## Scopes:
 #####################################################################
 
-extend_target(Sql CONDITION MSVC AND (TEST_architecture STREQUAL "i386")
+extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch  STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x62000000"
 )
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index afb1cd8e71..a92da0f32e 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -266,7 +266,7 @@ add_qt_resource(Widgets "qstyle1" PREFIX "/qt-project.org/styles/macstyle" BASE
 ## Scopes:
 #####################################################################
 
-extend_target(Widgets CONDITION MSVC AND (TEST_architecture STREQUAL "i386")
+extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch  STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x65000000"
 )
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 0891467640..7ce740476c 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -21,7 +21,7 @@ add_qt_module(Xml
 ## Scopes:
 #####################################################################
 
-extend_target(Xml CONDITION MSVC AND (TEST_architecture STREQUAL "i386")
+extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch  STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x61000000"
 )