From 76108058796bf0884f6fd128d81f1bc49f9a56af Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 4 Feb 2020 08:15:50 +0100 Subject: Regenerate examples Change-Id: I04b2adbe370ffea81d7787ad90e4ae69d2c165cb Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- examples/widgets/richtext/calendar/CMakeLists.txt | 6 +- examples/widgets/richtext/orderform/CMakeLists.txt | 14 +++- .../richtext/syntaxhighlighter/CMakeLists.txt | 6 +- .../widgets/richtext/textedit/.prev_CMakeLists.txt | 98 ++++++++++++++++++++++ examples/widgets/richtext/textedit/CMakeLists.txt | 74 +++++++++++++++- 5 files changed, 190 insertions(+), 8 deletions(-) create mode 100644 examples/widgets/richtext/textedit/.prev_CMakeLists.txt (limited to 'examples/widgets/richtext') diff --git a/examples/widgets/richtext/calendar/CMakeLists.txt b/examples/widgets/richtext/calendar/CMakeLists.txt index c09ebe5895..9cfc150a0e 100644 --- a/examples/widgets/richtext/calendar/CMakeLists.txt +++ b/examples/widgets/richtext/calendar/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/calendar") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(calendar @@ -18,6 +20,8 @@ add_qt_gui_executable(calendar mainwindow.cpp mainwindow.h ) target_link_libraries(calendar PUBLIC + Qt::Core + Qt::Gui Qt::Widgets ) diff --git a/examples/widgets/richtext/orderform/CMakeLists.txt b/examples/widgets/richtext/orderform/CMakeLists.txt index 58dae9ee5d..fc92c60c30 100644 --- a/examples/widgets/richtext/orderform/CMakeLists.txt +++ b/examples/widgets/richtext/orderform/CMakeLists.txt @@ -9,10 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/orderform") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS PrintSupport) add_qt_gui_executable(orderform detailsdialog.cpp detailsdialog.h @@ -20,10 +21,15 @@ add_qt_gui_executable(orderform mainwindow.cpp mainwindow.h ) target_link_libraries(orderform PUBLIC + Qt::Core + Qt::Gui Qt::Widgets ) -if (TARGET Qt::PrintSupport) - target_link_libraries(orderform PUBLIC Qt::PrintSupport) + +if(TARGET Qt::PrintSupport) + target_link_libraries(orderform PUBLIC + Qt::PrintSupport + ) endif() install(TARGETS orderform diff --git a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt index fb06e038ec..ec98b1af4f 100644 --- a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt +++ b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/syntaxhighlighter") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(syntaxhighlighter @@ -19,6 +21,8 @@ add_qt_gui_executable(syntaxhighlighter mainwindow.cpp mainwindow.h ) target_link_libraries(syntaxhighlighter PUBLIC + Qt::Core + Qt::Gui Qt::Widgets ) diff --git a/examples/widgets/richtext/textedit/.prev_CMakeLists.txt b/examples/widgets/richtext/textedit/.prev_CMakeLists.txt new file mode 100644 index 0000000000..dcb2b628ef --- /dev/null +++ b/examples/widgets/richtext/textedit/.prev_CMakeLists.txt @@ -0,0 +1,98 @@ +# Generated from textedit.pro. + +cmake_minimum_required(VERSION 3.14) +project(textedit LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/textedit") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) + +add_qt_gui_executable(textedit + main.cpp + textedit.cpp textedit.h +) +target_link_libraries(textedit PUBLIC + Qt::Core + Qt::Gui + Qt::Widgets +) + + +# Resources: +set(textedit_resource_files + "example.html" + "images/logo32.png" + "images/mac/checkbox-checked.png" + "images/mac/checkbox.png" + "images/mac/editcopy.png" + "images/mac/editcut.png" + "images/mac/editpaste.png" + "images/mac/editredo.png" + "images/mac/editundo.png" + "images/mac/exportpdf.png" + "images/mac/filenew.png" + "images/mac/fileopen.png" + "images/mac/fileprint.png" + "images/mac/filesave.png" + "images/mac/format-indent-less.png" + "images/mac/format-indent-more.png" + "images/mac/textbold.png" + "images/mac/textcenter.png" + "images/mac/textitalic.png" + "images/mac/textjustify.png" + "images/mac/textleft.png" + "images/mac/textright.png" + "images/mac/textunder.png" + "images/mac/zoomin.png" + "images/mac/zoomout.png" + "images/win/checkbox-checked.png" + "images/win/checkbox.png" + "images/win/editcopy.png" + "images/win/editcut.png" + "images/win/editpaste.png" + "images/win/editredo.png" + "images/win/editundo.png" + "images/win/exportpdf.png" + "images/win/filenew.png" + "images/win/fileopen.png" + "images/win/fileprint.png" + "images/win/filesave.png" + "images/win/format-indent-less.png" + "images/win/format-indent-more.png" + "images/win/textbold.png" + "images/win/textcenter.png" + "images/win/textitalic.png" + "images/win/textjustify.png" + "images/win/textleft.png" + "images/win/textright.png" + "images/win/textunder.png" + "images/win/zoomin.png" + "images/win/zoomout.png" +) + +qt6_add_resources(textedit "textedit" + PREFIX + "/" + FILES + ${textedit_resource_files} +) + +if(TARGET Qt::PrintSupport) + target_link_libraries(textedit PUBLIC + Qt::PrintSupport + ) +endif() + +install(TARGETS textedit + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/widgets/richtext/textedit/CMakeLists.txt b/examples/widgets/richtext/textedit/CMakeLists.txt index 4e63898264..8aa4e016fe 100644 --- a/examples/widgets/richtext/textedit/CMakeLists.txt +++ b/examples/widgets/richtext/textedit/CMakeLists.txt @@ -9,16 +9,20 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/textedit") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS PrintSupport) # special case add_qt_gui_executable(textedit main.cpp - textedit.cpp textedit.h textedit.qrc + textedit.cpp textedit.h ) target_link_libraries(textedit PUBLIC + Qt::Core + Qt::Gui Qt::Widgets ) # special case begin @@ -27,6 +31,72 @@ if (TARGET Qt::PrintSupport) endif() # special case end + +# Resources: +set(textedit_resource_files + "example.html" + "images/logo32.png" + "images/mac/checkbox-checked.png" + "images/mac/checkbox.png" + "images/mac/editcopy.png" + "images/mac/editcut.png" + "images/mac/editpaste.png" + "images/mac/editredo.png" + "images/mac/editundo.png" + "images/mac/exportpdf.png" + "images/mac/filenew.png" + "images/mac/fileopen.png" + "images/mac/fileprint.png" + "images/mac/filesave.png" + "images/mac/format-indent-less.png" + "images/mac/format-indent-more.png" + "images/mac/textbold.png" + "images/mac/textcenter.png" + "images/mac/textitalic.png" + "images/mac/textjustify.png" + "images/mac/textleft.png" + "images/mac/textright.png" + "images/mac/textunder.png" + "images/mac/zoomin.png" + "images/mac/zoomout.png" + "images/win/checkbox-checked.png" + "images/win/checkbox.png" + "images/win/editcopy.png" + "images/win/editcut.png" + "images/win/editpaste.png" + "images/win/editredo.png" + "images/win/editundo.png" + "images/win/exportpdf.png" + "images/win/filenew.png" + "images/win/fileopen.png" + "images/win/fileprint.png" + "images/win/filesave.png" + "images/win/format-indent-less.png" + "images/win/format-indent-more.png" + "images/win/textbold.png" + "images/win/textcenter.png" + "images/win/textitalic.png" + "images/win/textjustify.png" + "images/win/textleft.png" + "images/win/textright.png" + "images/win/textunder.png" + "images/win/zoomin.png" + "images/win/zoomout.png" +) + +qt6_add_resources(textedit "textedit" + PREFIX + "/" + FILES + ${textedit_resource_files} +) + +if(TARGET Qt::PrintSupport) + target_link_libraries(textedit PUBLIC + Qt::PrintSupport + ) +endif() + install(TARGETS textedit RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" -- cgit v1.2.3