From ceb29374983456e95c64b31f12d1386729d4bb1d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 19 Sep 2019 09:34:46 +0200 Subject: [PATCH] Fix add_qt_docs calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Brown paper bag for me, don't use a comma to separate parameters when calling a function. Change-Id: I21e16142fab4fd1c2714df13cd6a892b036e899a Reviewed-by: Mårten Nordheim --- src/concurrent/CMakeLists.txt | 2 +- src/corelib/CMakeLists.txt | 2 +- src/dbus/CMakeLists.txt | 2 +- src/gui/CMakeLists.txt | 2 +- src/network/CMakeLists.txt | 2 +- src/opengl/CMakeLists.txt | 2 +- src/platformheaders/CMakeLists.txt | 2 +- src/printsupport/CMakeLists.txt | 2 +- src/sql/CMakeLists.txt | 2 +- src/testlib/CMakeLists.txt | 2 +- src/widgets/CMakeLists.txt | 2 +- src/xml/CMakeLists.txt | 2 +- util/cmake/pro2cmake.py | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt index c745e1c71b9..7d7fa8c8591 100644 --- a/src/concurrent/CMakeLists.txt +++ b/src/concurrent/CMakeLists.txt @@ -43,7 +43,7 @@ extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i3 LINK_OPTIONS "/BASE:0x66000000" ) -add_qt_docs(Concurrent, +add_qt_docs(Concurrent doc/qtconcurrent.qdocconf ) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 701a884bc91..cbe87e406e1 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1119,7 +1119,7 @@ endif() # special case end qt_create_tracepoints(Core qtcore.tracepoints) -add_qt_docs(Core, +add_qt_docs(Core doc/qtcore.qdocconf ) diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index ec2a7787fd1..cb565b675e7 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -72,7 +72,7 @@ extend_target(DBus CONDITION WIN32 user32 ws2_32 ) -add_qt_docs(DBus, +add_qt_docs(DBus doc/qtdbus.qdocconf ) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index db987ac28ef..26261eb71d9 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -743,7 +743,7 @@ extend_target(Gui CONDITION WASM ) qt_create_tracepoints(Gui qtgui.tracepoints) -add_qt_docs(Gui, +add_qt_docs(Gui doc/qtgui.qdocconf ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index abd80b12bc9..e1e4a151c30 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -449,7 +449,7 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf -add_qt_docs(Network, +add_qt_docs(Network doc/qtnetwork.qdocconf ) diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index 26536afb3c3..f4c39343a70 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -54,7 +54,7 @@ extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect SOURCES qgraphicsshadereffect.cpp qgraphicsshadereffect_p.h ) -add_qt_docs(OpenGL, +add_qt_docs(OpenGL doc/qtopengl.qdocconf ) diff --git a/src/platformheaders/CMakeLists.txt b/src/platformheaders/CMakeLists.txt index 79ba95a8061..89daf134105 100644 --- a/src/platformheaders/CMakeLists.txt +++ b/src/platformheaders/CMakeLists.txt @@ -8,7 +8,7 @@ add_qt_module(PlatformHeaders) extend_target(PlatformHeaders CONDITION APPLE SOURCES cocoafunctions/qcocoawindowfunctions.h) -add_qt_docs( +add_qt_docs(PlatformHeaders doc/qtplatformheaders.qdocconf ) diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index c59c8370a89..861f36adbae 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -171,7 +171,7 @@ extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog SOURCES dialogs/qprintpreviewdialog.cpp dialogs/qprintpreviewdialog.h ) -add_qt_docs(PrintSupport, +add_qt_docs(PrintSupport doc/qtprintsupport.qdocconf ) diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index 6e729dffb7b..966862eb394 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -51,7 +51,7 @@ extend_target(Sql CONDITION QT_FEATURE_sqlmodel models/qsqlrelationaltablemodel.cpp models/qsqlrelationaltablemodel.h models/qsqltablemodel.cpp models/qsqltablemodel.h models/qsqltablemodel_p.h ) -add_qt_docs(Sql, +add_qt_docs(Sql doc/qtsql.qdocconf ) diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index e066ee5f8a9..0198c7a94f5 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -127,7 +127,7 @@ extend_target(Test CONDITION APPLE_OSX #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -add_qt_docs(Test, +add_qt_docs(Test doc/qttestlib.qdocconf ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 2871248611c..e4d8e844230 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -839,7 +839,7 @@ extend_target(Widgets CONDITION QT_FEATURE_qeventtransition qt_create_tracepoints(Widgets qtwidgets.tracepoints) -add_qt_docs(Widgets, +add_qt_docs(Widgets doc/qtwidgets.qdocconf ) diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 70931e90215..9a9d4310721 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -28,7 +28,7 @@ extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x61000000" ) -add_qt_docs(Xml, +add_qt_docs(Xml doc/qtxml.qdocconf ) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 0ebc94d72ed..c3e65c9de4a 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -2736,7 +2736,7 @@ def handle_app_or_lib( # ind = spaces(indent) write_source_file_list( - cm_fh, scope, "", ["QMAKE_DOCS"], indent, header=f"add_qt_docs({target},\n", footer=")\n" + cm_fh, scope, "", ["QMAKE_DOCS"], indent, header=f"add_qt_docs({target}\n", footer=")\n" )