diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 18:07:27 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 12:23:15 +0000 |
| commit | 9e1569de0f68530669e56cdb78061858d2db7461 (patch) | |
| tree | 3259d1780c8a420b89d92e4e8f3faf64590f69db /src | |
| parent | 816942521342e9a8c4c279fb6c759e65c8ff56be (diff) | |
Regenerate projectswip/cmake
Change-Id: Ib0291161ac908669b3add762a62df188f3f1b826
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/imports/winextras/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/winextras/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/winextras/doc/snippets/code/CMakeLists.txt | 2 |
4 files changed, 7 insertions, 12 deletions
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 |