summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-09-18 10:40:13 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-09-18 09:45:23 +0000
commit655b2ed90caf17b47a8cf3670a41502d5b5abb2f (patch)
tree227c8577f37e35c51ecdc3b4de2d11a471864a22 /src
parentcb5fbbde27a4cf217046085fc493ae076ba9bb02 (diff)
Re-generate main module CMake files
This fixes the calls to add_qt_docs to include the target. Change-Id: I2c4c807bca8faa48bb49f4b8710035f21abfca0e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/concurrent/CMakeLists.txt2
-rw-r--r--src/corelib/.prev_CMakeLists.txt2
-rw-r--r--src/corelib/CMakeLists.txt2
-rw-r--r--src/dbus/.prev_CMakeLists.txt2
-rw-r--r--src/dbus/CMakeLists.txt2
-rw-r--r--src/gui/.prev_CMakeLists.txt2
-rw-r--r--src/gui/CMakeLists.txt2
-rw-r--r--src/network/.prev_CMakeLists.txt2
-rw-r--r--src/network/CMakeLists.txt2
-rw-r--r--src/opengl/CMakeLists.txt2
-rw-r--r--src/printsupport/CMakeLists.txt2
-rw-r--r--src/sql/CMakeLists.txt2
-rw-r--r--src/testlib/.prev_CMakeLists.txt4
-rw-r--r--src/testlib/CMakeLists.txt2
-rw-r--r--src/widgets/.prev_CMakeLists.txt2
-rw-r--r--src/widgets/CMakeLists.txt2
-rw-r--r--src/xml/CMakeLists.txt2
17 files changed, 18 insertions, 18 deletions
diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt
index f330f10a1f..c745e1c71b 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(
+add_qt_docs(Concurrent,
doc/qtconcurrent.qdocconf
)
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 7d94c11c57..ebaed361a0 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -999,7 +999,7 @@ extend_target(Core CONDITION WASM
qt_create_tracepoints(Core qtcore.tracepoints)
-add_qt_docs(
+add_qt_docs(Core,
doc/qtcore.qdocconf
)
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index b9aa03a496..701a884bc9 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(
+add_qt_docs(Core,
doc/qtcore.qdocconf
)
diff --git a/src/dbus/.prev_CMakeLists.txt b/src/dbus/.prev_CMakeLists.txt
index aee116ffa7..851058b297 100644
--- a/src/dbus/.prev_CMakeLists.txt
+++ b/src/dbus/.prev_CMakeLists.txt
@@ -69,7 +69,7 @@ extend_target(DBus CONDITION WIN32
user32
ws2_32
)
-add_qt_docs(
+add_qt_docs(DBus,
doc/qtdbus.qdocconf
)
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index fdfbb485ab..ec2a7787fd 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(
+add_qt_docs(DBus,
doc/qtdbus.qdocconf
)
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 2f82fab5ab..5476fd9eac 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -620,7 +620,7 @@ extend_target(Gui CONDITION WASM
qt_create_tracepoints(Gui qtgui.tracepoints)
-add_qt_docs(
+add_qt_docs(Gui,
doc/qtgui.qdocconf
)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index f6a13b7cd5..db987ac28e 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(
+add_qt_docs(Gui,
doc/qtgui.qdocconf
)
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
index 7a2cac716c..0815b68d56 100644
--- a/src/network/.prev_CMakeLists.txt
+++ b/src/network/.prev_CMakeLists.txt
@@ -445,7 +445,7 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
LIBRARIES
crypt32
)
-add_qt_docs(
+add_qt_docs(Network,
doc/qtnetwork.qdocconf
)
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 7e392d393c..abd80b12bc 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(
+add_qt_docs(Network,
doc/qtnetwork.qdocconf
)
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 4076bc88df..26536afb3c 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(
+add_qt_docs(OpenGL,
doc/qtopengl.qdocconf
)
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
index 8809fbb884..c59c8370a8 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(
+add_qt_docs(PrintSupport,
doc/qtprintsupport.qdocconf
)
diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index 4f420afb99..6e729dffb7 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(
+add_qt_docs(Sql,
doc/qtsql.qdocconf
)
diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt
index 91652e21cb..60fb8bb1e0 100644
--- a/src/testlib/.prev_CMakeLists.txt
+++ b/src/testlib/.prev_CMakeLists.txt
@@ -60,7 +60,7 @@ add_qt_module(Test
PUBLIC_LIBRARIES
Qt::Core
COMPILE_OPTIONS
- --cs-exclude-file-abs-wildcard=$$QT_SOURCE_TREE/*
+ --cs-exclude-file-abs-wildcard=${QT_SOURCE_TREE}/*
--cs-include-file-abs-wildcard=*/src/testlib/*
--cs-mcc
--cs-mcdc
@@ -141,7 +141,7 @@ extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERS
#### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network:
# HEADERSCLEAN_EXCLUDE = "qtest_network.h"
-add_qt_docs(
+add_qt_docs(Test,
doc/qttestlib.qdocconf
)
diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
index 3f4763b42e..e066ee5f8a 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(
+add_qt_docs(Test,
doc/qttestlib.qdocconf
)
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt
index e800987d87..5f53e85739 100644
--- a/src/widgets/.prev_CMakeLists.txt
+++ b/src/widgets/.prev_CMakeLists.txt
@@ -835,7 +835,7 @@ extend_target(Widgets CONDITION QT_FEATURE_qeventtransition
qt_create_tracepoints(Widgets qtwidgets.tracepoints)
-add_qt_docs(
+add_qt_docs(Widgets,
doc/qtwidgets.qdocconf
)
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 5ee6bf778e..2871248611 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(
+add_qt_docs(Widgets,
doc/qtwidgets.qdocconf
)
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index d31f092e5d..70931e9021 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(
+add_qt_docs(Xml,
doc/qtxml.qdocconf
)