Regenerate projectswip/cmake

Change-Id: Ib0291161ac908669b3add762a62df188f3f1b826
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

17 files changed, 22 insertions, 28 deletions

diff --git a/examples/winextras/iconextractor/CMakeLists.txt b/examples/winextras/iconextractor/CMakeLists.txt
index e0fc195..7699184 100644
--- a/examples/winextras/iconextractor/CMakeLists.txt
+++ b/examples/winextras/iconextractor/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/winextras/iconextractor")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/winextras/musicplayer/CMakeLists.txt b/examples/winextras/musicplayer/CMakeLists.txt
index cb7ef71..b2fc7d7 100644
--- a/examples/winextras/musicplayer/CMakeLists.txt
+++ b/examples/winextras/musicplayer/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/winextras/musicplayer")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/winextras/quickplayer/CMakeLists.txt b/examples/winextras/quickplayer/CMakeLists.txt
index ac7bd39..6cbfb2f 100644
--- a/examples/winextras/quickplayer/CMakeLists.txt
+++ b/examples/winextras/quickplayer/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/winextras/quickplayer")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -24,6 +24,7 @@ target_link_libraries(quickplayer PUBLIC
     Qt::Quick
 )
 
+
 # Resources:
 set_source_files_properties("images/media-pause-16.png"
     PROPERTIES QT_RESOURCE_ALIAS "pause-16.png"
@@ -67,7 +68,6 @@ qt6_add_resources(quickplayer "quickplayer"
         ${quickplayer_resource_files}
 )
 
-
 install(TARGETS quickplayer
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt
index 92346ae..4597acf 100644
--- a/src/.prev_CMakeLists.txt
+++ b/src/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## src Binary:
 #####################################################################
 
-add_qt_executable(src
+qt_add_executable(src
     GUI
     PUBLIC_LIBRARIES
         Qt::Gui
diff --git a/src/imports/winextras/CMakeLists.txt b/src/imports/winextras/CMakeLists.txt
index 17f4e3f..7b7898a 100644
--- a/src/imports/winextras/CMakeLists.txt
+++ b/src/imports/winextras/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qml_winextras Plugin:
 #####################################################################
 
-add_qml_module(qml_winextras
+qt_add_qml_module(qml_winextras
     URI "QtWinExtras"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QWinExtrasQmlPlugin
@@ -36,12 +36,11 @@ add_qml_module(qml_winextras
 # OTHER_FILES = "qmldir" "JumpListLink.qml" "JumpListDestination.qml" "JumpListSeparator.qml"
 # QML_FILES = "JumpListLink.qml" "JumpListDestination.qml" "JumpListSeparator.qml"
 # TARGETPATH = "QtWinExtras"
-# _LOADED = "qml_plugin"
 
 ## Scopes:
 #####################################################################
 
-extend_target(qml_winextras CONDITION QT_FEATURE_dynamicgl OR NOT TARGET Qt::OpenGL
+qt_extend_target(qml_winextras CONDITION QT_FEATURE_dynamicgl OR NOT TARGET Qt::OpenGL
     LIBRARIES
         user32
 )
@@ -53,15 +52,12 @@ set(qml_files
 )
 set_source_files_properties(JumpListLink.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
-    QT_QML_SOURCE_INSTALL TRUE
 )
 set_source_files_properties(JumpListDestination.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
-    QT_QML_SOURCE_INSTALL TRUE
 )
 set_source_files_properties(JumpListSeparator.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
-    QT_QML_SOURCE_INSTALL TRUE
 )
 
 qt6_target_qml_files(qml_winextras
diff --git a/src/winextras/CMakeLists.txt b/src/winextras/CMakeLists.txt
index 8950db4..9ad5540 100644
--- a/src/winextras/CMakeLists.txt
+++ b/src/winextras/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## WinExtras Module:
 #####################################################################
 
-add_qt_module(WinExtras
+qt_add_module(WinExtras
     SOURCES
         qwinevent.cpp qwinevent.h
         qwineventfilter.cpp qwineventfilter_p.h
@@ -35,16 +35,15 @@ add_qt_module(WinExtras
 
 #### Keys ignored in scope 1:.:.:winextras.pro:<TRUE>:
 # OTHER_FILES = "doc/qtwinextras.qdocconf" "doc/src/qtwinextras-index.qdoc" "doc/src/qtwinextras-module-cpp.qdoc" "doc/src/qtwinextras-module-qml.qdoc" "doc/snippets/code/use-qtwinextras.pro" "doc/snippets/code/jumplist.cpp" "doc/snippets/code/use-qtwinextras.cpp" "doc/snippets/code/thumbbar.cpp" "doc/snippets/code/thumbbar.qml"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(WinExtras CONDITION QT_FEATURE_dynamicgl OR (WIN32 AND NOT TARGET Qt::OpenGL)
+qt_extend_target(WinExtras CONDITION QT_FEATURE_dynamicgl OR (WIN32 AND NOT TARGET Qt::OpenGL)
     LIBRARIES
         gdi32
 )
-add_qt_docs(WinExtras
+qt_add_docs(WinExtras
     doc/qtwinextras.qdocconf
 )
 
diff --git a/src/winextras/doc/snippets/code/CMakeLists.txt b/src/winextras/doc/snippets/code/CMakeLists.txt
index 41a1f1d..36ad466 100644
--- a/src/winextras/doc/snippets/code/CMakeLists.txt
+++ b/src/winextras/doc/snippets/code/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## use-qtwinextras Binary:
 #####################################################################
 
-add_qt_executable(use-qtwinextras
+qt_add_executable(use-qtwinextras
     GUI
     PUBLIC_LIBRARIES
         Qt::Gui
diff --git a/tests/auto/qpixmap/CMakeLists.txt b/tests/auto/qpixmap/CMakeLists.txt
index d4b4ab1..3fa1407 100644
--- a/tests/auto/qpixmap/CMakeLists.txt
+++ b/tests/auto/qpixmap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qpixmap Test:
 #####################################################################
 
-add_qt_test(tst_qpixmap
+qt_add_test(tst_qpixmap
     SOURCES
         tst_qpixmap.cpp
     PUBLIC_LIBRARIES
@@ -15,7 +15,7 @@ add_qt_test(tst_qpixmap
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qpixmap CONDITION QT_FEATURE_dynamicgl OR (WIN32 AND NOT TARGET Qt::OpenGL)
+qt_extend_target(tst_qpixmap CONDITION QT_FEATURE_dynamicgl OR (WIN32 AND NOT TARGET Qt::OpenGL)
     PUBLIC_LIBRARIES
         gdi32
         user32
diff --git a/tests/auto/qwinjumplist/CMakeLists.txt b/tests/auto/qwinjumplist/CMakeLists.txt
index 194b44c..a300ee8 100644
--- a/tests/auto/qwinjumplist/CMakeLists.txt
+++ b/tests/auto/qwinjumplist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwinjumplist Test:
 #####################################################################
 
-add_qt_test(tst_qwinjumplist
+qt_add_test(tst_qwinjumplist
     SOURCES
         tst_qwinjumplist.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qwinmime/CMakeLists.txt b/tests/auto/qwinmime/CMakeLists.txt
index c9d4054..e502d1f 100644
--- a/tests/auto/qwinmime/CMakeLists.txt
+++ b/tests/auto/qwinmime/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwinmime Test:
 #####################################################################
 
-add_qt_test(tst_qwinmime
+qt_add_test(tst_qwinmime
     SOURCES
         tst_qwinmime.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qwintaskbarbutton/CMakeLists.txt b/tests/auto/qwintaskbarbutton/CMakeLists.txt
index 5c2f4af..f313e0d 100644
--- a/tests/auto/qwintaskbarbutton/CMakeLists.txt
+++ b/tests/auto/qwintaskbarbutton/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwintaskbarbutton Test:
 #####################################################################
 
-add_qt_test(tst_qwintaskbarbutton
+qt_add_test(tst_qwintaskbarbutton
     SOURCES
         tst_qwintaskbarbutton.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qwintaskbarprogress/CMakeLists.txt b/tests/auto/qwintaskbarprogress/CMakeLists.txt
index 2d52b30..e218e3e 100644
--- a/tests/auto/qwintaskbarprogress/CMakeLists.txt
+++ b/tests/auto/qwintaskbarprogress/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwintaskbarprogress Test:
 #####################################################################
 
-add_qt_test(tst_qwintaskbarprogress
+qt_add_test(tst_qwintaskbarprogress
     SOURCES
         tst_qwintaskbarprogress.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qwinthumbnailtoolbar/CMakeLists.txt b/tests/auto/qwinthumbnailtoolbar/CMakeLists.txt
index cbb1cdb..ec17682 100644
--- a/tests/auto/qwinthumbnailtoolbar/CMakeLists.txt
+++ b/tests/auto/qwinthumbnailtoolbar/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwinthumbnailtoolbar Test:
 #####################################################################
 
-add_qt_test(tst_qwinthumbnailtoolbar
+qt_add_test(tst_qwinthumbnailtoolbar
     SOURCES
         tst_qwinthumbnailtoolbar.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/dwmfeatures/CMakeLists.txt b/tests/manual/dwmfeatures/CMakeLists.txt
index 18f1b84..0f9b3a2 100644
--- a/tests/manual/dwmfeatures/CMakeLists.txt
+++ b/tests/manual/dwmfeatures/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## dwmfeatures Binary:
 #####################################################################
 
-add_qt_executable(dwmfeatures
+qt_add_manual_test(dwmfeatures
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/imageconversion/CMakeLists.txt b/tests/manual/imageconversion/CMakeLists.txt
index dc85800..623561f 100644
--- a/tests/manual/imageconversion/CMakeLists.txt
+++ b/tests/manual/imageconversion/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## imageconversion Binary:
 #####################################################################
 
-add_qt_executable(imageconversion
+qt_add_manual_test(imageconversion
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/jumplist/CMakeLists.txt b/tests/manual/jumplist/CMakeLists.txt
index 7ef40a6..e5b8379 100644
--- a/tests/manual/jumplist/CMakeLists.txt
+++ b/tests/manual/jumplist/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## jumplist Binary:
 #####################################################################
 
-add_qt_executable(jumplist
+qt_add_manual_test(jumplist
     GUI
     SOURCES
         main.cpp
diff --git a/tests/manual/thumbnail/CMakeLists.txt b/tests/manual/thumbnail/CMakeLists.txt
index dd8a090..0730bc2 100644
--- a/tests/manual/thumbnail/CMakeLists.txt
+++ b/tests/manual/thumbnail/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## thumbnail Binary:
 #####################################################################
 
-add_qt_executable(thumbnail
-    GUI
+qt_add_manual_test(thumbnail
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES