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

Run make format

Browse Source 
Change-Id: If1107aefbfd374d6b664a94b21b9bbb5ed4cc178
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2020-01-16 09:39:26 +01:00
parent 99a824bbb7
commit b29cb7889a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/cmake/helper.py
View File

@ -363,12 +363,8 @@ _qt_library_map = [
"Qt::LinuxOfonoSupportPrivate", "Qt::LinuxOfonoSupportPrivate",
extra=["COMPONENTS", "LinuxOfonoSupportPrivate"], extra=["COMPONENTS", "LinuxOfonoSupportPrivate"],
), ),
LibraryMapping( LibraryMapping("tools", "Qt6", "Qt::Tools", extra=["COMPONENTS", "Tools"]),
"tools", "Qt6", "Qt::Tools", extra=["COMPONENTS", "Tools"] LibraryMapping("axcontainer", "Qt6", "Qt::AxContainer", extra=["COMPONENTS", "AxContainer"]),
),
LibraryMapping(
"axcontainer", "Qt6", "Qt::AxContainer", extra=["COMPONENTS", "AxContainer"]
),
LibraryMapping( LibraryMapping(
"webkitwidgets", "Qt6", "Qt::WebKitWidgets", extra=["COMPONENTS", "WebKitWidgets"] "webkitwidgets", "Qt6", "Qt::WebKitWidgets", extra=["COMPONENTS", "WebKitWidgets"]
) )

2
util/cmake/pro2cmake.py
View File

@ -2916,7 +2916,7 @@ def write_test(cm_fh: IO[str], scope: Scope, gui: bool = False, *, indent: int =
target_original = scope.TARGET_ORIGINAL target_original = scope.TARGET_ORIGINAL
if target_original and target_original.startswith("../"): 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) requires_content = expand_project_requirements(scope, skip_message=True)
if requires_content: if requires_content: