diff options
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 12 | ||||
| -rwxr-xr-x | util/cmake/pro2cmake.py | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index a5cd9ff022..7e94f8335e 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -865,9 +865,7 @@ def get_feature_mapping(): "enable": "TEST_posix_iconv AND TEST_iconv_needlib", "disable": "NOT TEST_posix_iconv OR NOT TEST_iconv_needlib", }, - "precompile_header": { - "condition": "BUILD_WITH_PCH" - }, + "precompile_header": {"condition": "BUILD_WITH_PCH"}, "profile": None, "qmakeargs": None, "qpa_default_platform": None, # Not a bool! @@ -876,7 +874,7 @@ def get_feature_mapping(): "rpath_dir": None, # merely used to fill the qmake variable EXTRA_RPATHS "rpath": { "autoDetect": "1", - "condition": "BUILD_SHARED_LIBS AND UNIX AND NOT WIN32 AND NOT ANDROID AND NOT APPLE" + "condition": "BUILD_SHARED_LIBS AND UNIX AND NOT WIN32 AND NOT ANDROID AND NOT APPLE", }, "sanitize_address": None, # sanitizer "sanitize_memory": None, @@ -893,9 +891,9 @@ def get_feature_mapping(): "type": "define", "name": "QT_STATIC", "prerequisite": "!defined(QT_SHARED) && !defined(QT_STATIC)", - "negative": True - } - ] + "negative": True, + }, + ], }, "silent": None, "sql-sqlite": {"condition": "QT_FEATURE_datestring"}, diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index d6d328a817..c64f7f5b56 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -189,7 +189,7 @@ def _parse_commandline(): dest="output_file", type=str, help="Specify a file path where the generated content should be written to." - "Default is to write to CMakeLists.txt in the same directory as the .pro file.", + "Default is to write to CMakeLists.txt in the same directory as the .pro file.", ) parser.add_argument( @@ -201,11 +201,13 @@ def _parse_commandline(): ) return parser.parse_args() + def get_top_level_repo_project_path(project_file_path: str = "") -> str: qmake_conf_path = find_qmake_conf(project_file_path) qmake_conf_dir_path = os.path.dirname(qmake_conf_path) return qmake_conf_dir_path + def is_top_level_repo_project(project_file_path: str = "") -> bool: qmake_conf_path = find_qmake_conf(project_file_path) qmake_conf_dir_path = os.path.dirname(qmake_conf_path) @@ -3689,7 +3691,8 @@ def write_qml_plugin_epilogue( cm_fh.write( f"{indent_0}set_source_files_properties({qml_file} PROPERTIES\n" f"{indent_1}QT_QML_SKIP_QMLDIR_ENTRY TRUE\n" - f"{indent_0})\n") + f"{indent_0})\n" + ) cm_fh.write( f"\n{indent_0}qt6_target_qml_files({target}\n{indent_1}FILES\n" |