summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-11-20 09:25:19 +0100
committerLeander Beernaert <leander.beernaert@qt.io>2019-11-25 14:53:27 +0000
commit1c655fb0fc08e89ab5efb23889266b710334f1a5 (patch)
treead0eae64bab5ffb902bf63bc88a98fed5cd1d83b /util
parentbc1cae774ad8cc084a98cb37d363770efbde025c (diff)
Post merge fixes
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
-rw-r--r--util/cmake/helper.py6
-rwxr-xr-xutil/cmake/pro2cmake.py13
2 files changed, 15 insertions, 4 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index 20ee7956ab..37135be7fa 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -356,6 +356,12 @@ _qt_library_map = [
"Qt6",
"Qt::LinuxOfonoSupport",
extra=["COMPONENTS", "LinuxOfonoSupport"],
+ ),
+ LibraryMapping(
+ "linuxofono_support_private",
+ "Qt6",
+ "Qt::LinuxOfonoSupportPrivate",
+ extra=["COMPONENTS", "LinuxOfonoSupportPrivate"],
)
# qtzlib: No longer supported.
]
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 3f5cc50fa5..02a845c713 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -1519,10 +1519,15 @@ def map_condition(condition: str) -> str:
condition = re.sub(r"(^| )armeabi-v7a", "TEST_architecture_arch STREQUAL arm", condition)
# some defines replacements
- condition = re.sub(r"DEFINES___contains___QT_NO_CURSOR", r"(NOT QT_FEATURE_cursor)", condition)
- condition = re.sub(
- r"DEFINES___contains___QT_NO_TRANSLATION", r"(NOT QT_FEATURE_translation)", condition
- )
+ condition = re.sub(r"DEFINES___contains___QT_NO_CURSOR",
+ r"(NOT QT_FEATURE_cursor)",
+ condition)
+ condition = re.sub(r"DEFINES___contains___QT_NO_TRANSLATION",
+ r"(NOT QT_FEATURE_translation)",
+ condition)
+ condition = re.sub(r"styles___contains___fusion",
+ r"QT_FEATURE_style_fusion",
+ condition)
cmake_condition = ""
for part in condition.split():