From 816942521342e9a8c4c279fb6c759e65c8ff56be Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 20 Sep 2019 11:44:30 +0200 Subject: Port qtwinextras to CMake Task-number: QTBUG-78164 Change-Id: I78109822b52f36a97d0a968ca5e7fb02c2b7eb28 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor Reviewed-by: Friedemann Kleint --- .prev_CMakeLists.txt | 23 ++++++++ CMakeLists.txt | 21 +++++++ coin/module_config.yaml | 26 +++++++++ examples/CMakeLists.txt | 9 +++ examples/winextras/CMakeLists.txt | 11 ++++ examples/winextras/iconextractor/CMakeLists.txt | 33 +++++++++++ examples/winextras/musicplayer/CMakeLists.txt | 37 ++++++++++++ examples/winextras/quickplayer/CMakeLists.txt | 75 +++++++++++++++++++++++++ src/.prev_CMakeLists.txt | 24 ++++++++ src/CMakeLists.txt | 12 ++++ src/imports/CMakeLists.txt | 3 + src/imports/winextras/CMakeLists.txt | 70 +++++++++++++++++++++++ src/winextras/CMakeLists.txt | 50 +++++++++++++++++ src/winextras/doc/snippets/code/CMakeLists.txt | 12 ++++ tests/.prev_CMakeLists.txt | 10 ++++ tests/CMakeLists.txt | 10 ++++ tests/auto/.prev_CMakeLists.txt | 9 +++ tests/auto/CMakeLists.txt | 9 +++ tests/auto/qpixmap/CMakeLists.txt | 22 ++++++++ tests/auto/qwinjumplist/CMakeLists.txt | 13 +++++ tests/auto/qwinmime/CMakeLists.txt | 14 +++++ tests/auto/qwintaskbarbutton/CMakeLists.txt | 13 +++++ tests/auto/qwintaskbarprogress/CMakeLists.txt | 13 +++++ tests/auto/qwinthumbnailtoolbar/CMakeLists.txt | 13 +++++ tests/manual/CMakeLists.txt | 8 +++ tests/manual/dwmfeatures/CMakeLists.txt | 21 +++++++ tests/manual/imageconversion/CMakeLists.txt | 19 +++++++ tests/manual/jumplist/CMakeLists.txt | 21 +++++++ tests/manual/thumbnail/CMakeLists.txt | 18 ++++++ 29 files changed, 619 insertions(+) create mode 100644 .prev_CMakeLists.txt create mode 100644 CMakeLists.txt create mode 100644 coin/module_config.yaml create mode 100644 examples/CMakeLists.txt create mode 100644 examples/winextras/CMakeLists.txt create mode 100644 examples/winextras/iconextractor/CMakeLists.txt create mode 100644 examples/winextras/musicplayer/CMakeLists.txt create mode 100644 examples/winextras/quickplayer/CMakeLists.txt create mode 100644 src/.prev_CMakeLists.txt create mode 100644 src/CMakeLists.txt create mode 100644 src/imports/CMakeLists.txt create mode 100644 src/imports/winextras/CMakeLists.txt create mode 100644 src/winextras/CMakeLists.txt create mode 100644 src/winextras/doc/snippets/code/CMakeLists.txt create mode 100644 tests/.prev_CMakeLists.txt create mode 100644 tests/CMakeLists.txt create mode 100644 tests/auto/.prev_CMakeLists.txt create mode 100644 tests/auto/CMakeLists.txt create mode 100644 tests/auto/qpixmap/CMakeLists.txt create mode 100644 tests/auto/qwinjumplist/CMakeLists.txt create mode 100644 tests/auto/qwinmime/CMakeLists.txt create mode 100644 tests/auto/qwintaskbarbutton/CMakeLists.txt create mode 100644 tests/auto/qwintaskbarprogress/CMakeLists.txt create mode 100644 tests/auto/qwinthumbnailtoolbar/CMakeLists.txt create mode 100644 tests/manual/CMakeLists.txt create mode 100644 tests/manual/dwmfeatures/CMakeLists.txt create mode 100644 tests/manual/imageconversion/CMakeLists.txt create mode 100644 tests/manual/jumplist/CMakeLists.txt create mode 100644 tests/manual/thumbnail/CMakeLists.txt diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt new file mode 100644 index 0000000..9157693 --- /dev/null +++ b/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from qtwinextras.pro. + +cmake_minimum_required(VERSION 3.15.0) + +project(QtWinExtras + VERSION 6.0.0 + DESCRIPTION "Qt WinExtras Libraries" + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) + +if(WINRT) + message(NOTICE "Skipping the build as the condition \"NOT WINRT\" is not met.") + return() +endif() +if(NOT TARGET Qt::Gui) + message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.") + return() +endif() +qt_build_repo() diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..f7fdcb9 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qtwinextras.pro. + +cmake_minimum_required(VERSION 3.15.0) + +project(QtWinExtras + VERSION 6.0.0 + DESCRIPTION "Qt WinExtras Libraries" + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Widgets Quick) # special case +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS) # special case + +# special case begin +if (NOT WIN32) + return() +endif() +# special case end + +qt_build_repo() diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 0000000..d554c07 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,26 @@ +version: 1 +accept_configuration: + condition: property + property: host.os + equals_property: target.os + +build_instructions: + - !include "{{qt/qtbase}}/prepare_building_env.yaml" + - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml" + - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" + +test_instructions: + - type: Group + instructions: + - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml" + enable_if: + condition: property + property: host.os + equals_value: Windows + - type: EnvironmentVariable + variableName: Dummy + variableValue: dummy + disable_if: + condition: property + property: host.os + equals_value: Windows diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 0000000..d263b93 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1,9 @@ +# Generated from examples.pro. + +qt_examples_build_begin() + +if(WIN32) + add_subdirectory(winextras) +endif() + +qt_examples_build_end() diff --git a/examples/winextras/CMakeLists.txt b/examples/winextras/CMakeLists.txt new file mode 100644 index 0000000..4347a1a --- /dev/null +++ b/examples/winextras/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from winextras.pro. + +if(WIN32) + add_subdirectory(iconextractor) +endif() +if(TARGET Qt::Multimedia AND TARGET Qt::Widgets AND WIN32) + add_subdirectory(musicplayer) +endif() +if(TARGET Qt::Multimedia AND TARGET Qt::Quick AND WIN32) + add_subdirectory(quickplayer) +endif() diff --git a/examples/winextras/iconextractor/CMakeLists.txt b/examples/winextras/iconextractor/CMakeLists.txt new file mode 100644 index 0000000..e0fc195 --- /dev/null +++ b/examples/winextras/iconextractor/CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from iconextractor.pro. + +cmake_minimum_required(VERSION 3.14) +project(iconextractor LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS WinExtras) + +add_executable(iconextractor + main.cpp +) +target_link_libraries(iconextractor PUBLIC + Qt::Core + Qt::Gui + Qt::WinExtras + shell32 + user32 +) + +install(TARGETS iconextractor + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/winextras/musicplayer/CMakeLists.txt b/examples/winextras/musicplayer/CMakeLists.txt new file mode 100644 index 0000000..cb7ef71 --- /dev/null +++ b/examples/winextras/musicplayer/CMakeLists.txt @@ -0,0 +1,37 @@ +# Generated from musicplayer.pro. + +cmake_minimum_required(VERSION 3.14) +project(musicplayer LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Multimedia) +find_package(Qt6 COMPONENTS WinExtras) + +add_qt_gui_executable(musicplayer + main.cpp + musicplayer.cpp musicplayer.h + volumebutton.cpp volumebutton.h +) +target_link_libraries(musicplayer PUBLIC + Qt::Core + Qt::Gui + Qt::Multimedia + Qt::Widgets + Qt::WinExtras +) + +install(TARGETS musicplayer + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/winextras/quickplayer/CMakeLists.txt b/examples/winextras/quickplayer/CMakeLists.txt new file mode 100644 index 0000000..ac7bd39 --- /dev/null +++ b/examples/winextras/quickplayer/CMakeLists.txt @@ -0,0 +1,75 @@ +# Generated from quickplayer.pro. + +cmake_minimum_required(VERSION 3.14) +project(quickplayer LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Quick) + +add_qt_gui_executable(quickplayer + main.cpp +) +target_link_libraries(quickplayer PUBLIC + Qt::Core + Qt::Gui + Qt::Quick +) + +# Resources: +set_source_files_properties("images/media-pause-16.png" + PROPERTIES QT_RESOURCE_ALIAS "pause-16.png" +) +set_source_files_properties("images/media-pause-32.png" + PROPERTIES QT_RESOURCE_ALIAS "pause-32.png" +) +set_source_files_properties("images/media-play-16.png" + PROPERTIES QT_RESOURCE_ALIAS "play-16.png" +) +set_source_files_properties("images/media-play-32.png" + PROPERTIES QT_RESOURCE_ALIAS "play-32.png" +) +set_source_files_properties("images/media-seek-backward-32.png" + PROPERTIES QT_RESOURCE_ALIAS "backward-32.png" +) +set_source_files_properties("images/media-seek-forward-32.png" + PROPERTIES QT_RESOURCE_ALIAS "forward-32.png" +) +set_source_files_properties("images/media-stop-32.png" + PROPERTIES QT_RESOURCE_ALIAS "stop-32.png" +) +set_source_files_properties("qml/main.qml" + PROPERTIES QT_RESOURCE_ALIAS "main.qml" +) +set(quickplayer_resource_files + "images/media-pause-16.png" + "images/media-pause-32.png" + "images/media-play-16.png" + "images/media-play-32.png" + "images/media-seek-backward-32.png" + "images/media-seek-forward-32.png" + "images/media-stop-32.png" + "qml/main.qml" +) + +qt6_add_resources(quickplayer "quickplayer" + PREFIX + "/" + FILES + ${quickplayer_resource_files} +) + + +install(TARGETS quickplayer + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt new file mode 100644 index 0000000..92346ae --- /dev/null +++ b/src/.prev_CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from src.pro. + +##################################################################### +## src Binary: +##################################################################### + +add_qt_executable(src + GUI + PUBLIC_LIBRARIES + Qt::Gui +) + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:src.pro:WIN32: +# SUBDIRS = "winextras" +# TEMPLATE = "subdirs" + +#### Keys ignored in scope 3:.:.:src.pro:TARGET Qt::Quick: +# SUBDIRS = "imports" + +#### Keys ignored in scope 4:.:.:src.pro:else: +# TEMPLATE = "aux" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..8107ccb --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,12 @@ +# special case begin +# Generated from src.pro. + +if(NOT WIN32) + return() +endif() + +add_subdirectory(winextras) +if(TARGET Qt::Quick) + add_subdirectory(imports) +endif() +# special case end diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt new file mode 100644 index 0000000..fdad931 --- /dev/null +++ b/src/imports/CMakeLists.txt @@ -0,0 +1,3 @@ +# Generated from imports.pro. + +add_subdirectory(winextras) diff --git a/src/imports/winextras/CMakeLists.txt b/src/imports/winextras/CMakeLists.txt new file mode 100644 index 0000000..17f4e3f --- /dev/null +++ b/src/imports/winextras/CMakeLists.txt @@ -0,0 +1,70 @@ +# Generated from winextras.pro. + +##################################################################### +## qml_winextras Plugin: +##################################################################### + +add_qml_module(qml_winextras + URI "QtWinExtras" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + CLASSNAME QWinExtrasQmlPlugin + SOURCES + plugin.cpp + qquickdwmfeatures.cpp qquickdwmfeatures_p.h + qquickdwmfeatures_p_p.h + qquickiconloader.cpp qquickiconloader_p.h + qquickjumplist.cpp qquickjumplist_p.h + qquickjumplistcategory.cpp qquickjumplistcategory_p.h + qquickjumplistitem.cpp qquickjumplistitem_p.h + qquicktaskbarbutton.cpp qquicktaskbarbutton_p.h + qquickthumbnailtoolbar.cpp qquickthumbnailtoolbar_p.h + qquickthumbnailtoolbutton.cpp qquickthumbnailtoolbutton_p.h + qquickwin_p.h + LIBRARIES + Qt::WinExtrasPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick + Qt::WinExtras +) + +#### Keys ignored in scope 1:.:.:winextras.pro:: +# CXX_MODULE = "qml" +# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# 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 + LIBRARIES + user32 +) + +set(qml_files + "JumpListLink.qml" + "JumpListDestination.qml" + "JumpListSeparator.qml" +) +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 + FILES + ${qml_files} +) diff --git a/src/winextras/CMakeLists.txt b/src/winextras/CMakeLists.txt new file mode 100644 index 0000000..8950db4 --- /dev/null +++ b/src/winextras/CMakeLists.txt @@ -0,0 +1,50 @@ +# Generated from winextras.pro. + +##################################################################### +## WinExtras Module: +##################################################################### + +add_qt_module(WinExtras + SOURCES + qwinevent.cpp qwinevent.h + qwineventfilter.cpp qwineventfilter_p.h + qwinextrasglobal.h + qwinfunctions.cpp qwinfunctions.h qwinfunctions_p.h + qwinjumplist.cpp qwinjumplist.h qwinjumplist_p.h + qwinjumplistcategory.cpp qwinjumplistcategory.h qwinjumplistcategory_p.h + qwinjumplistitem.cpp qwinjumplistitem.h qwinjumplistitem_p.h + qwinmime.cpp qwinmime.h + qwintaskbarbutton.cpp qwintaskbarbutton.h qwintaskbarbutton_p.h + qwintaskbarprogress.cpp qwintaskbarprogress.h + qwinthumbnailtoolbar.cpp qwinthumbnailtoolbar.h qwinthumbnailtoolbar_p.h + qwinthumbnailtoolbutton.cpp qwinthumbnailtoolbutton.h qwinthumbnailtoolbutton_p.h + windowsguidsdefs.cpp windowsguidsdefs_p.h + winpropkey_p.h + winshobjidl_p.h + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + dwmapi + ole32 + shell32 + shlwapi + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui +) + +#### Keys ignored in scope 1:.:.:winextras.pro:: +# 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) + LIBRARIES + gdi32 +) +add_qt_docs(WinExtras + doc/qtwinextras.qdocconf +) + diff --git a/src/winextras/doc/snippets/code/CMakeLists.txt b/src/winextras/doc/snippets/code/CMakeLists.txt new file mode 100644 index 0000000..41a1f1d --- /dev/null +++ b/src/winextras/doc/snippets/code/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from use-qtwinextras.pro. + +##################################################################### +## use-qtwinextras Binary: +##################################################################### + +add_qt_executable(use-qtwinextras + GUI + PUBLIC_LIBRARIES + Qt::Gui + Qt::WinExtras +) diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt new file mode 100644 index 0000000..aeadb1e --- /dev/null +++ b/tests/.prev_CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from tests.pro. + +if(NOT TARGET Qt::Test) + cmake_minimum_required(VERSION 3.15.0) + project(QtWinExtrasTests VERSION 6.0.0 LANGUAGES C CXX) + find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) + find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) + qt_set_up_standalone_tests_build() +endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..2e1e4c7 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from tests.pro. + +if(NOT TARGET Qt::Test) + cmake_minimum_required(VERSION 3.15.0) + project(QtWinExtrasTests VERSION 6.0.0 LANGUAGES C CXX) + find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Test Quick WinExtras Widgets) # special case + # find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS) # special case remove + qt_set_up_standalone_tests_build() +endif() +qt_build_tests() diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt new file mode 100644 index 0000000..3198e58 --- /dev/null +++ b/tests/auto/.prev_CMakeLists.txt @@ -0,0 +1,9 @@ +# Generated from auto.pro. + +add_subdirectory(cmake) +add_subdirectory(qwinthumbnailtoolbar) +add_subdirectory(qpixmap) +add_subdirectory(qwintaskbarbutton) +add_subdirectory(qwintaskbarprogress) +add_subdirectory(qwinjumplist) +add_subdirectory(qwinmime) diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt new file mode 100644 index 0000000..a73c4dc --- /dev/null +++ b/tests/auto/CMakeLists.txt @@ -0,0 +1,9 @@ +# Generated from auto.pro. + +# add_subdirectory(cmake) # special case remove +add_subdirectory(qwinthumbnailtoolbar) +add_subdirectory(qpixmap) +add_subdirectory(qwintaskbarbutton) +add_subdirectory(qwintaskbarprogress) +add_subdirectory(qwinjumplist) +add_subdirectory(qwinmime) diff --git a/tests/auto/qpixmap/CMakeLists.txt b/tests/auto/qpixmap/CMakeLists.txt new file mode 100644 index 0000000..d4b4ab1 --- /dev/null +++ b/tests/auto/qpixmap/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qpixmap.pro. + +##################################################################### +## tst_qpixmap Test: +##################################################################### + +add_qt_test(tst_qpixmap + SOURCES + tst_qpixmap.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::WinExtras +) + +## Scopes: +##################################################################### + +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 new file mode 100644 index 0000000..194b44c --- /dev/null +++ b/tests/auto/qwinjumplist/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qwinjumplist.pro. + +##################################################################### +## tst_qwinjumplist Test: +##################################################################### + +add_qt_test(tst_qwinjumplist + SOURCES + tst_qwinjumplist.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::WinExtras +) diff --git a/tests/auto/qwinmime/CMakeLists.txt b/tests/auto/qwinmime/CMakeLists.txt new file mode 100644 index 0000000..c9d4054 --- /dev/null +++ b/tests/auto/qwinmime/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qwinmime.pro. + +##################################################################### +## tst_qwinmime Test: +##################################################################### + +add_qt_test(tst_qwinmime + SOURCES + tst_qwinmime.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + Qt::WinExtras +) diff --git a/tests/auto/qwintaskbarbutton/CMakeLists.txt b/tests/auto/qwintaskbarbutton/CMakeLists.txt new file mode 100644 index 0000000..5c2f4af --- /dev/null +++ b/tests/auto/qwintaskbarbutton/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qwintaskbarbutton.pro. + +##################################################################### +## tst_qwintaskbarbutton Test: +##################################################################### + +add_qt_test(tst_qwintaskbarbutton + SOURCES + tst_qwintaskbarbutton.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::WinExtras +) diff --git a/tests/auto/qwintaskbarprogress/CMakeLists.txt b/tests/auto/qwintaskbarprogress/CMakeLists.txt new file mode 100644 index 0000000..2d52b30 --- /dev/null +++ b/tests/auto/qwintaskbarprogress/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qwintaskbarprogress.pro. + +##################################################################### +## tst_qwintaskbarprogress Test: +##################################################################### + +add_qt_test(tst_qwintaskbarprogress + SOURCES + tst_qwintaskbarprogress.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::WinExtras +) diff --git a/tests/auto/qwinthumbnailtoolbar/CMakeLists.txt b/tests/auto/qwinthumbnailtoolbar/CMakeLists.txt new file mode 100644 index 0000000..cbb1cdb --- /dev/null +++ b/tests/auto/qwinthumbnailtoolbar/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qwinthumbnailtoolbar.pro. + +##################################################################### +## tst_qwinthumbnailtoolbar Test: +##################################################################### + +add_qt_test(tst_qwinthumbnailtoolbar + SOURCES + tst_qwinthumbnailtoolbar.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::WinExtras +) diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt new file mode 100644 index 0000000..7b01593 --- /dev/null +++ b/tests/manual/CMakeLists.txt @@ -0,0 +1,8 @@ +# Generated from manual.pro. + +if(TARGET Qt::Widgets) + add_subdirectory(dwmfeatures) + add_subdirectory(jumplist) + add_subdirectory(thumbnail) + add_subdirectory(imageconversion) +endif() diff --git a/tests/manual/dwmfeatures/CMakeLists.txt b/tests/manual/dwmfeatures/CMakeLists.txt new file mode 100644 index 0000000..18f1b84 --- /dev/null +++ b/tests/manual/dwmfeatures/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from dwmfeatures.pro. + +##################################################################### +## dwmfeatures Binary: +##################################################################### + +add_qt_executable(dwmfeatures + GUI + SOURCES + main.cpp + testwidget.cpp testwidget.h testwidget.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + Qt::WinExtras + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:dwmfeatures.pro:: +# TEMPLATE = "app" diff --git a/tests/manual/imageconversion/CMakeLists.txt b/tests/manual/imageconversion/CMakeLists.txt new file mode 100644 index 0000000..dc85800 --- /dev/null +++ b/tests/manual/imageconversion/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from imageconversion.pro. + +##################################################################### +## imageconversion Binary: +##################################################################### + +add_qt_executable(imageconversion + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + Qt::WinExtras + gdi32 + user32 +) + +#### Keys ignored in scope 1:.:.:imageconversion.pro:: +# TEMPLATE = "app" diff --git a/tests/manual/jumplist/CMakeLists.txt b/tests/manual/jumplist/CMakeLists.txt new file mode 100644 index 0000000..7ef40a6 --- /dev/null +++ b/tests/manual/jumplist/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from jumplist.pro. + +##################################################################### +## jumplist Binary: +##################################################################### + +add_qt_executable(jumplist + GUI + SOURCES + main.cpp + testwidget.cpp testwidget.h testwidget.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + Qt::WinExtras + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:jumplist.pro:: +# TEMPLATE = "app" diff --git a/tests/manual/thumbnail/CMakeLists.txt b/tests/manual/thumbnail/CMakeLists.txt new file mode 100644 index 0000000..dd8a090 --- /dev/null +++ b/tests/manual/thumbnail/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from thumbnail.pro. + +##################################################################### +## thumbnail Binary: +##################################################################### + +add_qt_executable(thumbnail + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + Qt::WinExtras +) + +#### Keys ignored in scope 1:.:.:thumbnail.pro:: +# TEMPLATE = "app" -- cgit v1.2.3 From 9e1569de0f68530669e56cdb78061858d2db7461 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 14 Nov 2019 18:07:27 +0100 Subject: Regenerate projects Change-Id: Ib0291161ac908669b3add762a62df188f3f1b826 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- examples/winextras/iconextractor/CMakeLists.txt | 2 +- examples/winextras/musicplayer/CMakeLists.txt | 2 +- examples/winextras/quickplayer/CMakeLists.txt | 4 ++-- src/.prev_CMakeLists.txt | 2 +- src/imports/winextras/CMakeLists.txt | 8 ++------ src/winextras/CMakeLists.txt | 7 +++---- src/winextras/doc/snippets/code/CMakeLists.txt | 2 +- tests/auto/qpixmap/CMakeLists.txt | 4 ++-- tests/auto/qwinjumplist/CMakeLists.txt | 2 +- tests/auto/qwinmime/CMakeLists.txt | 2 +- tests/auto/qwintaskbarbutton/CMakeLists.txt | 2 +- tests/auto/qwintaskbarprogress/CMakeLists.txt | 2 +- tests/auto/qwinthumbnailtoolbar/CMakeLists.txt | 2 +- tests/manual/dwmfeatures/CMakeLists.txt | 2 +- tests/manual/imageconversion/CMakeLists.txt | 2 +- tests/manual/jumplist/CMakeLists.txt | 2 +- tests/manual/thumbnail/CMakeLists.txt | 3 +-- 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:: # 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 -- cgit v1.2.3