diff options
22 files changed, 110 insertions, 195 deletions
diff --git a/examples/pdf/multipage/CMakeLists.txt b/examples/pdf/multipage/CMakeLists.txt index e89c8d238..7fdfbf678 100644 --- a/examples/pdf/multipage/CMakeLists.txt +++ b/examples/pdf/multipage/CMakeLists.txt @@ -1,28 +1,25 @@ cmake_minimum_required(VERSION 3.16) project(multipage LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/pdf/multipage") -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 REQUIRED COMPONENTS Gui Qml) qt_add_executable(multipage main.cpp ) + set_target_properties(multipage PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(multipage PUBLIC Qt::Gui Qt::Qml diff --git a/examples/pdf/pdfviewer/CMakeLists.txt b/examples/pdf/pdfviewer/CMakeLists.txt index 5a3821399..179734dc4 100644 --- a/examples/pdf/pdfviewer/CMakeLists.txt +++ b/examples/pdf/pdfviewer/CMakeLists.txt @@ -1,28 +1,25 @@ cmake_minimum_required(VERSION 3.16) project(pdfviewer LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/pdf/pdfviewer") -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 REQUIRED COMPONENTS Gui Qml) qt_add_executable(pdfviewerquick main.cpp ) + set_target_properties(pdfviewerquick PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(pdfviewerquick PUBLIC Qt::Gui Qt::Qml diff --git a/examples/pdfwidgets/pdfviewer/CMakeLists.txt b/examples/pdfwidgets/pdfviewer/CMakeLists.txt index 692c33371..a93e8d435 100644 --- a/examples/pdfwidgets/pdfviewer/CMakeLists.txt +++ b/examples/pdfwidgets/pdfviewer/CMakeLists.txt @@ -1,23 +1,16 @@ -# Generated from pdfviewer.pro. - cmake_minimum_required(VERSION 3.16) project(pdfviewer LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/pdfwidgets/pdfviewer") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(pdfviewerwidgets main.cpp @@ -25,10 +18,12 @@ qt_add_executable(pdfviewerwidgets pageselector.cpp pageselector.h zoomselector.cpp zoomselector.h ) + set_target_properties(pdfviewerwidgets PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(pdfviewerwidgets PUBLIC Qt::Core Qt::Gui @@ -36,7 +31,6 @@ target_link_libraries(pdfviewerwidgets PUBLIC Qt::PdfWidgets ) - # Resources: set(resources_resource_files "images/busy.png" diff --git a/examples/webenginequick/customdialogs/CMakeLists.txt b/examples/webenginequick/customdialogs/CMakeLists.txt index 47d773c48..b1899fd66 100644 --- a/examples/webenginequick/customdialogs/CMakeLists.txt +++ b/examples/webenginequick/customdialogs/CMakeLists.txt @@ -1,30 +1,27 @@ cmake_minimum_required(VERSION 3.16) project(customdialogs LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/customdialogs") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineQuick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineQuick) qt_add_executable(customdialogs main.cpp server.cpp server.h ) + set_target_properties(customdialogs PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(customdialogs PUBLIC Qt::Core Qt::Gui diff --git a/examples/webenginequick/lifecycle/CMakeLists.txt b/examples/webenginequick/lifecycle/CMakeLists.txt index 8f90cbf48..556b50706 100644 --- a/examples/webenginequick/lifecycle/CMakeLists.txt +++ b/examples/webenginequick/lifecycle/CMakeLists.txt @@ -1,37 +1,31 @@ cmake_minimum_required(VERSION 3.16) project(lifecycle LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/lifecycle") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS QuickControls2) -find_package(Qt6 COMPONENTS WebEngineQuick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui QuickControls2 WebEngineQuick) qt_add_executable(lifecycle main.cpp ) + set_target_properties(lifecycle PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(lifecycle PUBLIC Qt::Core Qt::Gui Qt::WebEngineQuick ) - # Resources: set(resources_resource_files "WebBrowser.qml" diff --git a/examples/webenginequick/minimal/CMakeLists.txt b/examples/webenginequick/minimal/CMakeLists.txt index 9155ce040..e0cb66733 100644 --- a/examples/webenginequick/minimal/CMakeLists.txt +++ b/examples/webenginequick/minimal/CMakeLists.txt @@ -1,36 +1,31 @@ cmake_minimum_required(VERSION 3.16) project(minimal LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/minimal-qml") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineQuick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineQuick) qt_add_executable(webengine-minimal-qml main.cpp ) + set_target_properties(webengine-minimal-qml PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(webengine-minimal-qml PUBLIC Qt::Core Qt::Gui Qt::WebEngineQuick ) - # Resources: set(qml_resource_files "main.qml" diff --git a/examples/webenginequick/quicknanobrowser/CMakeLists.txt b/examples/webenginequick/quicknanobrowser/CMakeLists.txt index 9a70a2c22..cdccc26be 100644 --- a/examples/webenginequick/quicknanobrowser/CMakeLists.txt +++ b/examples/webenginequick/quicknanobrowser/CMakeLists.txt @@ -1,32 +1,26 @@ cmake_minimum_required(VERSION 3.16) project(quicknanobrowser LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/quicknanobrowser") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS WebEngineQuick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick WebEngineQuick) qt_add_executable(quicknanobrowser main.cpp utils.h ) + set_target_properties(quicknanobrowser PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(quicknanobrowser PUBLIC Qt::Core Qt::Gui @@ -35,7 +29,6 @@ target_link_libraries(quicknanobrowser PUBLIC Qt::WebEngineQuick ) - # Resources: set(resources_resource_files "ApplicationRoot.qml" @@ -52,6 +45,7 @@ qt_add_resources(quicknanobrowser "resources" FILES ${resources_resource_files} ) + set(resources1_resource_files "icons/3rdparty/go-next.png" "icons/3rdparty/go-previous.png" diff --git a/examples/webenginequick/recipebrowser/CMakeLists.txt b/examples/webenginequick/recipebrowser/CMakeLists.txt index 9643234e7..57a73b4aa 100644 --- a/examples/webenginequick/recipebrowser/CMakeLists.txt +++ b/examples/webenginequick/recipebrowser/CMakeLists.txt @@ -1,32 +1,25 @@ cmake_minimum_required(VERSION 3.16) project(recipebrowser LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/recipebrowser") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS QuickControls2) -find_package(Qt6 COMPONENTS WebEngineQuick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick QuickControls2 WebEngineQuick) qt_add_executable(recipebrowser main.cpp ) + set_target_properties(recipebrowser PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(recipebrowser PUBLIC Qt::Core Qt::Gui @@ -36,68 +29,87 @@ target_link_libraries(recipebrowser PUBLIC Qt::WebEngineQuick ) - # Resources: set_source_files_properties("resources/pages/assets/3rdparty/markdown.css" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/assets/3rdparty/marked.js" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/assets/custom.css" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/assets/custom.js" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/burger.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/cupcakes.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/burger.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/cupcakes.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/pasta.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/pizza.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/skewers.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/soup.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/steak.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/pasta.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/pizza.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/skewers.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/soup.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/steak.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/qml/RecipeList.qml" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/qml/main.qml" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set(resources_resource_files "resources/pages/assets/3rdparty/markdown.css" "resources/pages/assets/3rdparty/marked.js" diff --git a/examples/webenginequick/webengineaction/CMakeLists.txt b/examples/webenginequick/webengineaction/CMakeLists.txt index 926825d21..1d6ae3fe5 100644 --- a/examples/webenginequick/webengineaction/CMakeLists.txt +++ b/examples/webenginequick/webengineaction/CMakeLists.txt @@ -1,36 +1,31 @@ cmake_minimum_required(VERSION 3.16) project(webengineaction LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginequick/webengineaction") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineQuick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineQuick) qt_add_executable(webengineaction main.cpp ) + set_target_properties(webengineaction PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(webengineaction PUBLIC Qt::Core Qt::Gui Qt::WebEngineQuick ) - # Resources: set(qml_resource_files "main.qml" diff --git a/examples/webenginewidgets/contentmanipulation/CMakeLists.txt b/examples/webenginewidgets/contentmanipulation/CMakeLists.txt index ae93a7a7e..b53274507 100644 --- a/examples/webenginewidgets/contentmanipulation/CMakeLists.txt +++ b/examples/webenginewidgets/contentmanipulation/CMakeLists.txt @@ -1,37 +1,32 @@ cmake_minimum_required(VERSION 3.16) project(contentmanipulation LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/contentmanipulation") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(contentmanipulation main.cpp mainwindow.cpp mainwindow.h ) + set_target_properties(contentmanipulation PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(contentmanipulation PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(jquery_resource_files "jquery.min.js" diff --git a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt index e94ecae7a..c5c6b41d3 100644 --- a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt +++ b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt @@ -1,21 +1,16 @@ cmake_minimum_required(VERSION 3.16) project(cookiebrowser LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/cookiebrowser") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(cookiebrowser cookiedialog.ui @@ -23,17 +18,18 @@ qt_add_executable(cookiebrowser main.cpp mainwindow.cpp mainwindow.h mainwindow.ui ) + set_target_properties(cookiebrowser PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(cookiebrowser PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(cookiebrowser_resource_files "3rdparty/view-refresh.png" diff --git a/examples/webenginewidgets/html2pdf/CMakeLists.txt b/examples/webenginewidgets/html2pdf/CMakeLists.txt index 80567e88f..7e3758d1a 100644 --- a/examples/webenginewidgets/html2pdf/CMakeLists.txt +++ b/examples/webenginewidgets/html2pdf/CMakeLists.txt @@ -1,29 +1,25 @@ cmake_minimum_required(VERSION 3.16) project(html2pdf LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/html2pdf") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(html2pdf html2pdf.cpp ) + set_target_properties(html2pdf PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(html2pdf PUBLIC Qt::Core Qt::Gui diff --git a/examples/webenginewidgets/maps/CMakeLists.txt b/examples/webenginewidgets/maps/CMakeLists.txt index 01eb96e70..62eb04e42 100644 --- a/examples/webenginewidgets/maps/CMakeLists.txt +++ b/examples/webenginewidgets/maps/CMakeLists.txt @@ -1,30 +1,26 @@ cmake_minimum_required(VERSION 3.16) project(maps LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/maps") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(maps main.cpp mainwindow.cpp mainwindow.h ) + set_target_properties(maps PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(maps PUBLIC Qt::Core Qt::Gui diff --git a/examples/webenginewidgets/markdowneditor/CMakeLists.txt b/examples/webenginewidgets/markdowneditor/CMakeLists.txt index 3852b93d4..c1a0974a0 100644 --- a/examples/webenginewidgets/markdowneditor/CMakeLists.txt +++ b/examples/webenginewidgets/markdowneditor/CMakeLists.txt @@ -1,22 +1,16 @@ cmake_minimum_required(VERSION 3.16) project(markdowneditor LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/markdowneditor") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) -find_package(Qt6 COMPONENTS WebChannel) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebChannel WebEngineWidgets) qt_add_executable(markdowneditor document.cpp document.h @@ -24,10 +18,12 @@ qt_add_executable(markdowneditor mainwindow.cpp mainwindow.h mainwindow.ui previewpage.cpp previewpage.h ) + set_target_properties(markdowneditor PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(markdowneditor PUBLIC Qt::Core Qt::Gui @@ -35,7 +31,6 @@ target_link_libraries(markdowneditor PUBLIC Qt::WebEngineWidgets ) - # Resources: set(markdowneditor_resource_files "resources/3rdparty/markdown.css" diff --git a/examples/webenginewidgets/minimal/CMakeLists.txt b/examples/webenginewidgets/minimal/CMakeLists.txt index 6c8c44e98..7c1cac1d8 100644 --- a/examples/webenginewidgets/minimal/CMakeLists.txt +++ b/examples/webenginewidgets/minimal/CMakeLists.txt @@ -1,29 +1,25 @@ cmake_minimum_required(VERSION 3.16) project(minimal LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/minimal-widgets") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(minimal-widgets main.cpp ) + set_target_properties(minimal-widgets PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(minimal-widgets PUBLIC Qt::Core Qt::Gui diff --git a/examples/webenginewidgets/notifications/CMakeLists.txt b/examples/webenginewidgets/notifications/CMakeLists.txt index 6e152cf6c..17d4f343b 100644 --- a/examples/webenginewidgets/notifications/CMakeLists.txt +++ b/examples/webenginewidgets/notifications/CMakeLists.txt @@ -1,37 +1,32 @@ cmake_minimum_required(VERSION 3.16) project(notifications LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/notifications") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(notifications main.cpp notificationpopup.h ) + set_target_properties(notifications PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(notifications PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(data_resource_files "data/icon.png" diff --git a/examples/webenginewidgets/printme/CMakeLists.txt b/examples/webenginewidgets/printme/CMakeLists.txt index ada0bf250..2c38103c1 100644 --- a/examples/webenginewidgets/printme/CMakeLists.txt +++ b/examples/webenginewidgets/printme/CMakeLists.txt @@ -1,31 +1,26 @@ cmake_minimum_required(VERSION 3.16) project(printme LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/printme") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) -find_package(Qt6 COMPONENTS PrintSupport) +find_package(Qt6 REQUIRED COMPONENTS Core Gui PrintSupport WebEngineWidgets) qt_add_executable(printme main.cpp printhandler.cpp printhandler.h ) + set_target_properties(printme PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(printme PUBLIC Qt::Core Qt::Gui @@ -33,7 +28,6 @@ target_link_libraries(printme PUBLIC Qt::WebEngineWidgets ) - # Resources: set(data_resource_files "data/icon.svg" diff --git a/examples/webenginewidgets/simplebrowser/CMakeLists.txt b/examples/webenginewidgets/simplebrowser/CMakeLists.txt index ee11c02d1..f23bce709 100644 --- a/examples/webenginewidgets/simplebrowser/CMakeLists.txt +++ b/examples/webenginewidgets/simplebrowser/CMakeLists.txt @@ -1,21 +1,16 @@ cmake_minimum_required(VERSION 3.16) project(simplebrowser LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/simplebrowser") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(simplebrowser browser.cpp browser.h @@ -30,17 +25,18 @@ qt_add_executable(simplebrowser webpopupwindow.cpp webpopupwindow.h webview.cpp webview.h ) + set_target_properties(simplebrowser PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(simplebrowser PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(simplebrowser_resource_files "data/AppLogoColor.png" @@ -55,6 +51,7 @@ qt_add_resources(simplebrowser "simplebrowser" FILES ${simplebrowser_resource_files} ) + set(simplebrowser1_resource_files "data/3rdparty/dialog-error.png" "data/3rdparty/edit-clear.png" diff --git a/examples/webenginewidgets/spellchecker/CMakeLists.txt b/examples/webenginewidgets/spellchecker/CMakeLists.txt index 1a0c76b06..d76881c65 100644 --- a/examples/webenginewidgets/spellchecker/CMakeLists.txt +++ b/examples/webenginewidgets/spellchecker/CMakeLists.txt @@ -1,37 +1,32 @@ cmake_minimum_required(VERSION 3.16) project(spellchecker LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/spellchecker") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(spellchecker main.cpp webview.cpp webview.h ) + set_target_properties(spellchecker PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(spellchecker PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(spellchecker_resource_files "data/icon.svg" @@ -66,4 +61,3 @@ foreach(dictFile ${dicts}) OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) endforeach() - diff --git a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt index e0a1723f1..55bd6715e 100644 --- a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt +++ b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt @@ -1,38 +1,34 @@ cmake_minimum_required(VERSION 3.16) project(stylesheetbrowser LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/stylesheetbrowser") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(stylesheetbrowser main.cpp mainwindow.cpp mainwindow.h mainwindow.ui stylesheetdialog.cpp stylesheetdialog.h stylesheetdialog.ui ) + set_target_properties(stylesheetbrowser PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(stylesheetbrowser PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(stylesheetbrowser_resource_files "3rdparty/view-refresh.png" diff --git a/examples/webenginewidgets/videoplayer/CMakeLists.txt b/examples/webenginewidgets/videoplayer/CMakeLists.txt index 61f4e40c6..4e3e3cc2c 100644 --- a/examples/webenginewidgets/videoplayer/CMakeLists.txt +++ b/examples/webenginewidgets/videoplayer/CMakeLists.txt @@ -1,21 +1,15 @@ cmake_minimum_required(VERSION 3.16) project(videoplayer LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/videoplayer") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(videoplayer fullscreennotification.cpp fullscreennotification.h @@ -23,17 +17,18 @@ qt_add_executable(videoplayer main.cpp mainwindow.cpp mainwindow.h ) + set_target_properties(videoplayer PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(videoplayer PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(videoplayer_resource_files "data/index.html" diff --git a/examples/webenginewidgets/webui/CMakeLists.txt b/examples/webenginewidgets/webui/CMakeLists.txt index 4d8123e1f..e736a2cde 100644 --- a/examples/webenginewidgets/webui/CMakeLists.txt +++ b/examples/webenginewidgets/webui/CMakeLists.txt @@ -1,37 +1,32 @@ cmake_minimum_required(VERSION 3.16) project(webui LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/webui") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(webui main.cpp webuihandler.cpp webuihandler.h ) + set_target_properties(webui PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(webui PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(webui_resource_files "about.html" |