summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-11-13 15:00:38 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-14 09:05:48 +0000
commite9a58ba9e55467f8c69e19dd52c2afa7cbb39529 (patch)
tree0d9d92641192c7bc7ca7c6d451d7d123d80ea6bb /src/tools
parent38354d7d6132344a322751c91202109d847771b9 (diff)
Regenerate src/*
Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/androiddeployqt/.prev_CMakeLists.txt4
-rw-r--r--src/tools/androiddeployqt/CMakeLists.txt4
-rw-r--r--src/tools/androidtestrunner/CMakeLists.txt4
-rw-r--r--src/tools/bootstrap/.prev_CMakeLists.txt20
-rw-r--r--src/tools/bootstrap/CMakeLists.txt16
-rw-r--r--src/tools/moc/.prev_CMakeLists.txt2
-rw-r--r--src/tools/moc/CMakeLists.txt2
-rw-r--r--src/tools/qdbuscpp2xml/.prev_CMakeLists.txt6
-rw-r--r--src/tools/qdbuscpp2xml/CMakeLists.txt2
-rw-r--r--src/tools/qdbusxml2cpp/.prev_CMakeLists.txt6
-rw-r--r--src/tools/qdbusxml2cpp/CMakeLists.txt2
-rw-r--r--src/tools/qlalr/.prev_CMakeLists.txt2
-rw-r--r--src/tools/qlalr/CMakeLists.txt2
-rw-r--r--src/tools/qvkgen/.prev_CMakeLists.txt2
-rw-r--r--src/tools/qvkgen/CMakeLists.txt2
-rw-r--r--src/tools/rcc/.prev_CMakeLists.txt6
-rw-r--r--src/tools/rcc/CMakeLists.txt6
-rw-r--r--src/tools/tracegen/.prev_CMakeLists.txt2
-rw-r--r--src/tools/tracegen/CMakeLists.txt2
-rw-r--r--src/tools/uic/.prev_CMakeLists.txt2
-rw-r--r--src/tools/uic/CMakeLists.txt2
21 files changed, 48 insertions, 48 deletions
diff --git a/src/tools/androiddeployqt/.prev_CMakeLists.txt b/src/tools/androiddeployqt/.prev_CMakeLists.txt
index 53c3fbd22e..e445201b82 100644
--- a/src/tools/androiddeployqt/.prev_CMakeLists.txt
+++ b/src/tools/androiddeployqt/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## androiddeployqt Binary:
#####################################################################
-add_qt_executable(androiddeployqt
+qt_add_executable(androiddeployqt
SOURCES
main.cpp
DEFINES
@@ -21,7 +21,7 @@ add_qt_executable(androiddeployqt
## Scopes:
#####################################################################
-extend_target(androiddeployqt CONDITION windows
+qt_extend_target(androiddeployqt CONDITION windows
COMPILE_OPTIONS
-U__STRICT_ANSI__
)
diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt
index 30410f7532..d47e10efd2 100644
--- a/src/tools/androiddeployqt/CMakeLists.txt
+++ b/src/tools/androiddeployqt/CMakeLists.txt
@@ -4,7 +4,7 @@
## androiddeployqt Binary:
#####################################################################
-add_qt_executable(androiddeployqt
+qt_add_executable(androiddeployqt
SOURCES
main.cpp
DEFINES
@@ -21,7 +21,7 @@ add_qt_executable(androiddeployqt
## Scopes:
#####################################################################
-extend_target(androiddeployqt CONDITION windows
+qt_extend_target(androiddeployqt CONDITION windows
COMPILE_OPTIONS
-U__STRICT_ANSI__
)
diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt
index 1ae3218662..d7ec4a66fa 100644
--- a/src/tools/androidtestrunner/CMakeLists.txt
+++ b/src/tools/androidtestrunner/CMakeLists.txt
@@ -4,7 +4,7 @@
## androidtestrunner Binary:
#####################################################################
-add_qt_executable(androidtestrunner
+qt_add_executable(androidtestrunner
SOURCES
main.cpp
DEFINES
@@ -21,7 +21,7 @@ add_qt_executable(androidtestrunner
## Scopes:
#####################################################################
-extend_target(androidtestrunner CONDITION windows
+qt_extend_target(androidtestrunner CONDITION windows
COMPILE_OPTIONS
-U__STRICT_ANSI__
)
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index 1f3bf0b98f..811b7d2fb3 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## Bootstrap Module:
#####################################################################
-add_qt_module(Bootstrap
+qt_add_module(Bootstrap
STATIC
INTERNAL_MODULE
NO_SYNC_QT
@@ -117,7 +117,7 @@ add_qt_module(Bootstrap
## Scopes:
#####################################################################
-extend_target(Bootstrap CONDITION UNIX
+qt_extend_target(Bootstrap CONDITION UNIX
SOURCES
../../corelib/io/qfilesystemengine_unix.cpp
../../corelib/io/qfilesystemiterator_unix.cpp
@@ -131,7 +131,7 @@ extend_target(Bootstrap CONDITION UNIX
../../corelib/kernel/qsystemsemaphore_unix.cpp
)
-extend_target(Bootstrap CONDITION WIN32
+qt_extend_target(Bootstrap CONDITION WIN32
SOURCES
../../corelib/global/qoperatingsystemversion_win.cpp
../../corelib/io/qfilesystemengine_win.cpp
@@ -151,7 +151,7 @@ extend_target(Bootstrap CONDITION WIN32
user32
)
-extend_target(Bootstrap CONDITION APPLE
+qt_extend_target(Bootstrap CONDITION APPLE
SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm
../../corelib/kernel/qcore_foundation.mm
@@ -162,24 +162,24 @@ extend_target(Bootstrap CONDITION APPLE
${FWFoundation}
)
-extend_target(Bootstrap CONDITION APPLE_OSX
+qt_extend_target(Bootstrap CONDITION APPLE_OSX
SOURCES
../../corelib/io/qstandardpaths_mac.mm
LIBRARIES
${FWCoreServices}
)
-extend_target(Bootstrap CONDITION APPLE_UIKIT
+qt_extend_target(Bootstrap CONDITION APPLE_UIKIT
LIBRARIES
${FWUIKit}
)
-extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
+qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
SOURCES
../../corelib/io/qstandardpaths_unix.cpp
)
-extend_target(Bootstrap CONDITION cross_compile
+qt_extend_target(Bootstrap CONDITION cross_compile
SOURCES
../../3rdparty/zlib/src/adler32.c
../../3rdparty/zlib/src/compress.c
@@ -200,12 +200,12 @@ extend_target(Bootstrap CONDITION cross_compile
../../3rdparty/zlib/src
)
-extend_target(Bootstrap CONDITION NOT cross_compile
+qt_extend_target(Bootstrap CONDITION NOT cross_compile
LIBRARIES
ZLIB::ZLIB
)
-extend_target(Bootstrap CONDITION WIN32 AND mingw
+qt_extend_target(Bootstrap CONDITION WIN32 AND mingw
PUBLIC_LIBRARIES
uuid
)
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 7c9071e20b..d4350da373 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -6,7 +6,7 @@
# special case:
add_library(Bootstrap STATIC)
-extend_target(Bootstrap
+qt_extend_target(Bootstrap
SOURCES
../../corelib/codecs/qlatincodec.cpp
../../corelib/codecs/qtextcodec.cpp
@@ -122,7 +122,7 @@ extend_target(Bootstrap
## Scopes:
#####################################################################
-extend_target(Bootstrap CONDITION UNIX
+qt_extend_target(Bootstrap CONDITION UNIX
SOURCES
../../corelib/io/qfilesystemengine_unix.cpp
../../corelib/io/qfilesystemiterator_unix.cpp
@@ -136,7 +136,7 @@ extend_target(Bootstrap CONDITION UNIX
../../corelib/kernel/qsystemsemaphore_unix.cpp
)
-extend_target(Bootstrap CONDITION WIN32
+qt_extend_target(Bootstrap CONDITION WIN32
SOURCES
../../corelib/global/qoperatingsystemversion_win.cpp
../../corelib/io/qfilesystemengine_win.cpp
@@ -156,7 +156,7 @@ extend_target(Bootstrap CONDITION WIN32
user32
)
-extend_target(Bootstrap CONDITION APPLE
+qt_extend_target(Bootstrap CONDITION APPLE
SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm
../../corelib/kernel/qcore_foundation.mm
@@ -167,19 +167,19 @@ extend_target(Bootstrap CONDITION APPLE
${FWFoundation}
)
-extend_target(Bootstrap CONDITION APPLE_OSX
+qt_extend_target(Bootstrap CONDITION APPLE_OSX
SOURCES
../../corelib/io/qstandardpaths_mac.mm
LIBRARIES
${FWCoreServices}
)
-extend_target(Bootstrap CONDITION APPLE_UIKIT
+qt_extend_target(Bootstrap CONDITION APPLE_UIKIT
LIBRARIES
${FWUIKit}
)
-extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
+qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
SOURCES
../../corelib/io/qstandardpaths_unix.cpp
)
@@ -188,7 +188,7 @@ extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
# extend_target(Bootstrap CONDITION cross_compile [...])
# extend_target(Bootstrap CONDITION NOT cross_compile [...])
-extend_target(Bootstrap CONDITION WIN32 AND mingw
+qt_extend_target(Bootstrap CONDITION WIN32 AND mingw
PUBLIC_LIBRARIES
uuid
)
diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt
index 4948963636..ffadd2e2be 100644
--- a/src/tools/moc/.prev_CMakeLists.txt
+++ b/src/tools/moc/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## moc Tool:
#####################################################################
-add_qt_tool(moc
+qt_add_tool(moc
BOOTSTRAP
SOURCES
cbordevice.h
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index 75f5a46163..c9786674f1 100644
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -4,7 +4,7 @@
## moc Tool:
#####################################################################
-add_qt_tool(moc
+qt_add_tool(moc
BOOTSTRAP
TOOLS_TARGET Core # special case
SOURCES
diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
index 04553a4852..9d51b4eac9 100644
--- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qdbuscpp2xml Tool:
#####################################################################
-add_qt_tool(qdbuscpp2xml
+qt_add_tool(qdbuscpp2xml
SOURCES
../moc/cbordevice.h
../moc/collectjson.cpp ../moc/collectjson.h
@@ -34,14 +34,14 @@ add_qt_tool(qdbuscpp2xml
## Scopes:
#####################################################################
-extend_target(qdbuscpp2xml CONDITION force_bootstrap
+qt_extend_target(qdbuscpp2xml CONDITION force_bootstrap
LIBRARIES
bootstrap_dbusPrivate
PUBLIC_LIBRARIES
bootstrap_dbus
)
-extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap
+qt_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap
LIBRARIES
Qt::DBusPrivate
PUBLIC_LIBRARIES
diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt
index 30e53ee475..499e5fb6ae 100644
--- a/src/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/CMakeLists.txt
@@ -4,7 +4,7 @@
## qdbuscpp2xml Tool:
#####################################################################
-add_qt_tool(qdbuscpp2xml
+qt_add_tool(qdbuscpp2xml
TOOLS_TARGET DBus # special case
SOURCES
../moc/cbordevice.h
diff --git a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
index 9b4112a73f..202e751727 100644
--- a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
+++ b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qdbusxml2cpp Tool:
#####################################################################
-add_qt_tool(qdbusxml2cpp
+qt_add_tool(qdbusxml2cpp
SOURCES
qdbusxml2cpp.cpp
DEFINES
@@ -21,14 +21,14 @@ add_qt_tool(qdbusxml2cpp
## Scopes:
#####################################################################
-extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap
+qt_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap
LIBRARIES
Qt::DBusPrivate
PUBLIC_LIBRARIES
Qt::DBus
)
-extend_target(qdbusxml2cpp CONDITION force_bootstrap
+qt_extend_target(qdbusxml2cpp CONDITION force_bootstrap
LIBRARIES
bootstrap_dbusPrivate
PUBLIC_LIBRARIES
diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt
index f2a9a60e68..f97cbb1180 100644
--- a/src/tools/qdbusxml2cpp/CMakeLists.txt
+++ b/src/tools/qdbusxml2cpp/CMakeLists.txt
@@ -4,7 +4,7 @@
## qdbusxml2cpp Tool:
#####################################################################
-add_qt_tool(qdbusxml2cpp
+qt_add_tool(qdbusxml2cpp
TOOLS_TARGET DBus # special case
SOURCES
qdbusxml2cpp.cpp
diff --git a/src/tools/qlalr/.prev_CMakeLists.txt b/src/tools/qlalr/.prev_CMakeLists.txt
index 435f776ed3..9ff8a54ce4 100644
--- a/src/tools/qlalr/.prev_CMakeLists.txt
+++ b/src/tools/qlalr/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qlalr Tool:
#####################################################################
-add_qt_tool(qlalr
+qt_add_tool(qlalr
SOURCES
compress.cpp compress.h
cppgenerator.cpp cppgenerator.h
diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt
index 876f5147f5..437c8d918f 100644
--- a/src/tools/qlalr/CMakeLists.txt
+++ b/src/tools/qlalr/CMakeLists.txt
@@ -4,7 +4,7 @@
## qlalr Tool:
#####################################################################
-add_qt_tool(qlalr
+qt_add_tool(qlalr
TOOLS_TARGET Core # special case
SOURCES
compress.cpp compress.h
diff --git a/src/tools/qvkgen/.prev_CMakeLists.txt b/src/tools/qvkgen/.prev_CMakeLists.txt
index 79d30d2599..994b97a9f1 100644
--- a/src/tools/qvkgen/.prev_CMakeLists.txt
+++ b/src/tools/qvkgen/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qvkgen Tool:
#####################################################################
-add_qt_tool(qvkgen
+qt_add_tool(qvkgen
SOURCES
qvkgen.cpp
PUBLIC_LIBRARIES
diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt
index b6cb8609da..0f72a8b633 100644
--- a/src/tools/qvkgen/CMakeLists.txt
+++ b/src/tools/qvkgen/CMakeLists.txt
@@ -4,7 +4,7 @@
## qvkgen Tool:
#####################################################################
-add_qt_tool(qvkgen
+qt_add_tool(qvkgen
TOOLS_TARGET Gui # special case
SOURCES
qvkgen.cpp
diff --git a/src/tools/rcc/.prev_CMakeLists.txt b/src/tools/rcc/.prev_CMakeLists.txt
index 31a9492e5f..f7b790ee5a 100644
--- a/src/tools/rcc/.prev_CMakeLists.txt
+++ b/src/tools/rcc/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## rcc Tool:
#####################################################################
-add_qt_tool(rcc
+qt_add_tool(rcc
BOOTSTRAP
SOURCES
main.cpp
@@ -24,14 +24,14 @@ add_qt_tool(rcc
## Scopes:
#####################################################################
-extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile
+qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile
DEFINES
QT_FEATURE_zstd=1
LIBRARIES
ZSTD::ZSTD
)
-extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd
+qt_extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd
DEFINES
QT_FEATURE_zstd=-1
)
diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
index 49f6228701..64610dd991 100644
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -4,7 +4,7 @@
## rcc Tool:
#####################################################################
-add_qt_tool(rcc
+qt_add_tool(rcc
BOOTSTRAP
TOOLS_TARGET Core # special case
SOURCES
@@ -25,14 +25,14 @@ add_qt_tool(rcc
## Scopes:
#####################################################################
-extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile
+qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile
DEFINES
QT_FEATURE_zstd=1
LIBRARIES
ZSTD::ZSTD
)
-extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd
+qt_extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd
DEFINES
QT_FEATURE_zstd=-1
)
diff --git a/src/tools/tracegen/.prev_CMakeLists.txt b/src/tools/tracegen/.prev_CMakeLists.txt
index e94caeb634..87bcf362d6 100644
--- a/src/tools/tracegen/.prev_CMakeLists.txt
+++ b/src/tools/tracegen/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tracegen Tool:
#####################################################################
-add_qt_tool(tracegen
+qt_add_tool(tracegen
BOOTSTRAP
SOURCES
etw.cpp etw.h
diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt
index 5231fe676e..0f12f823c4 100644
--- a/src/tools/tracegen/CMakeLists.txt
+++ b/src/tools/tracegen/CMakeLists.txt
@@ -4,7 +4,7 @@
## tracegen Tool:
#####################################################################
-add_qt_tool(tracegen
+qt_add_tool(tracegen
BOOTSTRAP
TOOLS_TARGET Core # special case
SOURCES
diff --git a/src/tools/uic/.prev_CMakeLists.txt b/src/tools/uic/.prev_CMakeLists.txt
index b35d54f3fd..4cd28d7070 100644
--- a/src/tools/uic/.prev_CMakeLists.txt
+++ b/src/tools/uic/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## uic Tool:
#####################################################################
-add_qt_tool(uic
+qt_add_tool(uic
SOURCES
cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h
cpp/cppwriteincludes.cpp cpp/cppwriteincludes.h
diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index 2dd5011b3e..21fd232349 100644
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -4,7 +4,7 @@
## uic Tool:
#####################################################################
-add_qt_tool(uic
+qt_add_tool(uic
TOOLS_TARGET Widgets # special case
SOURCES
cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h