1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix architecture conditions

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2019-04-02 16:03:18 +02:00
parent 9a7de16fac
commit 547c7f8ca5
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/concurrent/CMakeLists.txt
View File

@ -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"
)

2
src/corelib/CMakeLists.txt
View File

@ -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"
)

2
src/gui/CMakeLists.txt
View File

@ -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
)

2
src/network/CMakeLists.txt
View File

@ -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"
)

2
src/opengl/CMakeLists.txt
View File

@ -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"
)

2
src/sql/CMakeLists.txt
View File

@ -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"
)

2
src/widgets/CMakeLists.txt
View File

@ -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"
)

2
src/xml/CMakeLists.txt
View File

@ -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"
)

4
util/cmake/pro2cmake.py
View File

@ -1175,9 +1175,9 @@ def recursive_evaluate_scope(scope: Scope, parent_condition: str = '',
def map_to_cmake_condition(condition: str) -> str:
condition = re.sub(r'\bQT_ARCH___equals___([a-zA-Z_0-9]*)',
r'(TEST_architecture STREQUAL "\1")', condition)
r'(TEST_architecture_arch STREQUAL "\1")', condition)
condition = re.sub(r'\bQT_ARCH___contains___([a-zA-Z_0-9]*)',
r'(TEST_architecture STREQUAL "\1")', condition)
r'(TEST_architecture_arch STREQUAL "\1")', condition)
return condition