From b29cb7889ac5b3a7b4b515971f462f65b7db7ec4 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 16 Jan 2020 09:39:26 +0100 Subject: [PATCH] Run make format Change-Id: If1107aefbfd374d6b664a94b21b9bbb5ed4cc178 Reviewed-by: Alexandru Croitor --- util/cmake/helper.py | 8 ++------ 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 9ee3714cdc4..091b619201f 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 ffb36324cd8..3ad427f609b 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: