diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 09:39:26 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 08:41:08 +0000 |
| commit | b29cb7889ac5b3a7b4b515971f462f65b7db7ec4 (patch) | |
| tree | f52c469d9c85f7c0e13bf58629ffe2401606e91e | |
| parent | 99a824bbb74aa88a16a8c7b483e1ca599dd66d4f (diff) | |
Run make format
Change-Id: If1107aefbfd374d6b664a94b21b9bbb5ed4cc178
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | util/cmake/helper.py | 8 | ||||
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 9ee3714cdc..091b619201 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -363,12 +363,8 @@ _qt_library_map = [ "Qt::LinuxOfonoSupportPrivate", extra=["COMPONENTS", "LinuxOfonoSupportPrivate"], ), - LibraryMapping( - "tools", "Qt6", "Qt::Tools", extra=["COMPONENTS", "Tools"] - ), - LibraryMapping( - "axcontainer", "Qt6", "Qt::AxContainer", extra=["COMPONENTS", "AxContainer"] - ), + LibraryMapping("tools", "Qt6", "Qt::Tools", extra=["COMPONENTS", "Tools"]), + LibraryMapping("axcontainer", "Qt6", "Qt::AxContainer", extra=["COMPONENTS", "AxContainer"]), LibraryMapping( "webkitwidgets", "Qt6", "Qt::WebKitWidgets", extra=["COMPONENTS", "WebKitWidgets"] ) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index ffb36324cd..3ad427f609 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -2916,7 +2916,7 @@ def write_test(cm_fh: IO[str], scope: Scope, gui: bool = False, *, indent: int = target_original = scope.TARGET_ORIGINAL if target_original and target_original.startswith("../"): - extra.append("OUTPUT_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/../\"") + extra.append('OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"') requires_content = expand_project_requirements(scope, skip_message=True) if requires_content: |