diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-28 10:59:26 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-28 10:59:40 +0200 |
commit | 094d8971fa5f0b1a52345346678e1101a7481431 (patch) | |
tree | 73b32ea1c82a9fc88d9e832d05791fbd8d67b5da /src | |
parent | d5dcc15006f7bfb580c3a0f491ff923f8ac2b103 (diff) | |
parent | 9e1569de0f68530669e56cdb78061858d2db7461 (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Task-number: QTBUG-83252
Task-number: QTBUG-78164
Change-Id: I0adb9c5ae6b125772ad495aadaf5e7e51da8aa88
Diffstat (limited to 'src')
-rw-r--r-- | src/.prev_CMakeLists.txt | 24 | ||||
-rw-r--r-- | src/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/imports/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/imports/winextras/CMakeLists.txt | 66 | ||||
-rw-r--r-- | src/winextras/CMakeLists.txt | 49 | ||||
-rw-r--r-- | src/winextras/doc/snippets/code/CMakeLists.txt | 12 |
6 files changed, 166 insertions, 0 deletions
diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt new file mode 100644 index 0000000..4597acf --- /dev/null +++ b/src/.prev_CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from src.pro. + +##################################################################### +## src Binary: +##################################################################### + +qt_add_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..7b7898a --- /dev/null +++ b/src/imports/winextras/CMakeLists.txt @@ -0,0 +1,66 @@ +# Generated from winextras.pro. + +##################################################################### +## qml_winextras Plugin: +##################################################################### + +qt_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:<TRUE>: +# 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" + +## Scopes: +##################################################################### + +qt_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" +) +set_source_files_properties(JumpListDestination.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) +set_source_files_properties(JumpListSeparator.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" +) + +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..9ad5540 --- /dev/null +++ b/src/winextras/CMakeLists.txt @@ -0,0 +1,49 @@ +# Generated from winextras.pro. + +##################################################################### +## WinExtras Module: +##################################################################### + +qt_add_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:<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" + +## Scopes: +##################################################################### + +qt_extend_target(WinExtras CONDITION QT_FEATURE_dynamicgl OR (WIN32 AND NOT TARGET Qt::OpenGL) + LIBRARIES + gdi32 +) +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 new file mode 100644 index 0000000..36ad466 --- /dev/null +++ b/src/winextras/doc/snippets/code/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from use-qtwinextras.pro. + +##################################################################### +## use-qtwinextras Binary: +##################################################################### + +qt_add_executable(use-qtwinextras + GUI + PUBLIC_LIBRARIES + Qt::Gui + Qt::WinExtras +) |