From 1da25250f9dc3199013b6769fae5e21970bc1e13 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 31 Aug 2021 10:34:13 +0200 Subject: Remove .prev_CMakeLists.txt We don't need to use pro2cmake anymore here. Change-Id: Iba8bac70c1fe31e56bf9680608913cc2c336f946 Reviewed-by: Mitch Curtis (cherry picked from commit 405bbc1c0e12e888807ff458c6df600968420e83) Reviewed-by: Qt Cherry-pick Bot --- examples/.prev_CMakeLists.txt | 14 --- examples/qmltest/qmltest/.prev_CMakeLists.txt | 50 ---------- examples/quick/.prev_CMakeLists.txt | 40 -------- examples/quick/customitems/.prev_CMakeLists.txt | 4 - examples/quick/particles/.prev_CMakeLists.txt | 7 -- examples/quick/rendercontrol/.prev_CMakeLists.txt | 6 -- examples/quick/text/.prev_CMakeLists.txt | 99 ------------------- .../quickcontrols2/gallery/.prev_CMakeLists.txt | 110 --------------------- .../quickcontrols2/texteditor/.prev_CMakeLists.txt | 73 -------------- 9 files changed, 403 deletions(-) delete mode 100644 examples/.prev_CMakeLists.txt delete mode 100644 examples/qmltest/qmltest/.prev_CMakeLists.txt delete mode 100644 examples/quick/.prev_CMakeLists.txt delete mode 100644 examples/quick/customitems/.prev_CMakeLists.txt delete mode 100644 examples/quick/particles/.prev_CMakeLists.txt delete mode 100644 examples/quick/rendercontrol/.prev_CMakeLists.txt delete mode 100644 examples/quick/text/.prev_CMakeLists.txt delete mode 100644 examples/quickcontrols2/gallery/.prev_CMakeLists.txt delete mode 100644 examples/quickcontrols2/texteditor/.prev_CMakeLists.txt (limited to 'examples') diff --git a/examples/.prev_CMakeLists.txt b/examples/.prev_CMakeLists.txt deleted file mode 100644 index 4688b21b4b..0000000000 --- a/examples/.prev_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Generated from examples.pro. - -qt_examples_build_begin() - -add_subdirectory(qml) -if(TARGET Qt::QuickTest) - add_subdirectory(qmltest) -endif() -if(TARGET Qt::Quick) - add_subdirectory(quick) -endif() -add_subdirectory(quickcontrols2) - -qt_examples_build_end() diff --git a/examples/qmltest/qmltest/.prev_CMakeLists.txt b/examples/qmltest/qmltest/.prev_CMakeLists.txt deleted file mode 100644 index c50eb7bcd3..0000000000 --- a/examples/qmltest/qmltest/.prev_CMakeLists.txt +++ /dev/null @@ -1,50 +0,0 @@ -# Generated from qmltest.pro. - -cmake_minimum_required(VERSION 3.14) -project(tst_qmltestexample 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") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) - -qt_add_executable(tst_qmltestexample - tst_qmltest.cpp -) -set_target_properties(tst_qmltestexample PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(tst_qmltestexample PUBLIC - Qt::Core - Qt::Gui -) - -if(QT_BUILDING_QT) - target_link_libraries(tst_qmltestexample PUBLIC - Qt::Qml - Qt::QuickTest - ) -endif() - -if(MACOS AND QT_BUILDING_QT) - set_target_properties(tst_qmltestexample PROPERTIES - MACOSX_BUNDLE FALSE - ) -endif() - -install(TARGETS tst_qmltestexample - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/quick/.prev_CMakeLists.txt b/examples/quick/.prev_CMakeLists.txt deleted file mode 100644 index 5299e95ae2..0000000000 --- a/examples/quick/.prev_CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Generated from quick.pro. - -add_subdirectory(quick-accessibility) -add_subdirectory(animation) -add_subdirectory(draganddrop) -add_subdirectory(externaldraganddrop) -add_subdirectory(canvas) -add_subdirectory(imageelements) -add_subdirectory(keyinteraction) -add_subdirectory(layouts) -add_subdirectory(localstorage) -add_subdirectory(models) -add_subdirectory(views) -add_subdirectory(tableview) -add_subdirectory(mousearea) -add_subdirectory(positioners) -add_subdirectory(righttoleft) -add_subdirectory(scenegraph) -add_subdirectory(shadereffects) -add_subdirectory(text) -add_subdirectory(threading) -add_subdirectory(touchinteraction) -add_subdirectory(tutorials) -add_subdirectory(customitems) -add_subdirectory(imageprovider) -add_subdirectory(imageresponseprovider) -add_subdirectory(window) -add_subdirectory(particles) -add_subdirectory(delegatechooser) -add_subdirectory(shapes) -if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) - add_subdirectory(textureprovider) - add_subdirectory(rendercontrol) -endif() -if(TARGET Qt::Widgets) - add_subdirectory(embeddedinwidgets) -endif() -if(TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) AND (QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR TARGET Qt::QuickWidgets)) - add_subdirectory(quickwidgets) -endif() diff --git a/examples/quick/customitems/.prev_CMakeLists.txt b/examples/quick/customitems/.prev_CMakeLists.txt deleted file mode 100644 index 4afbfe3f6b..0000000000 --- a/examples/quick/customitems/.prev_CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Generated from customitems.pro. - -add_subdirectory(painteditem) -add_subdirectory(maskedmousearea) diff --git a/examples/quick/particles/.prev_CMakeLists.txt b/examples/quick/particles/.prev_CMakeLists.txt deleted file mode 100644 index 1dbf49be21..0000000000 --- a/examples/quick/particles/.prev_CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Generated from particles.pro. - -add_subdirectory(affectors) -add_subdirectory(emitters) -add_subdirectory(imageparticle) -add_subdirectory(itemparticle) -add_subdirectory(system) diff --git a/examples/quick/rendercontrol/.prev_CMakeLists.txt b/examples/quick/rendercontrol/.prev_CMakeLists.txt deleted file mode 100644 index 53924b33ce..0000000000 --- a/examples/quick/rendercontrol/.prev_CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -# Generated from rendercontrol.pro. - -add_subdirectory(rendercontrol_opengl) -if(WIN32 AND NOT MINGW) - add_subdirectory(rendercontrol_d3d11) -endif() diff --git a/examples/quick/text/.prev_CMakeLists.txt b/examples/quick/text/.prev_CMakeLists.txt deleted file mode 100644 index ada8f2b376..0000000000 --- a/examples/quick/text/.prev_CMakeLists.txt +++ /dev/null @@ -1,99 +0,0 @@ -# Generated from text.pro. - -cmake_minimum_required(VERSION 3.14) -project(text 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") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/text") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Qml) - -qt_add_executable(text - main.cpp -) -set_target_properties(text PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(text PUBLIC - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick -) - - -# Resources: -set(text_resource_files - "fonts/availableFonts.qml" - "fonts/banner.qml" - "fonts/content/fonts/tarzeau_ocr_a.ttf" - "fonts/fonts.qml" - "fonts/hello.qml" - "imgtag/TextWithImage.qml" - "imgtag/images/face-sad.png" - "imgtag/images/face-smile-big.png" - "imgtag/images/face-smile.png" - "imgtag/images/heart200.png" - "imgtag/images/qtlogo.png" - "imgtag/images/starfish_2.png" - "imgtag/imgtag.qml" - "styledtext-layout.qml" - "text.qml" - "textselection/pics/endHandle.png" - "textselection/pics/endHandle.sci" - "textselection/pics/startHandle.png" - "textselection/pics/startHandle.sci" - "textselection/textselection.qml" -) - -qt6_add_resources(text "text" - PREFIX - "/text" - FILES - ${text_resource_files} -) -set(shared_resource_files - "../shared/Button.qml" - "../shared/CheckBox.qml" - "../shared/FlickrRssModel.qml" - "../shared/Label.qml" - "../shared/LauncherList.qml" - "../shared/SimpleLauncherDelegate.qml" - "../shared/Slider.qml" - "../shared/TabSet.qml" - "../shared/TextField.qml" - "../shared/images/back.png" - "../shared/images/checkmark.png" - "../shared/images/next.png" - "../shared/images/qt-logo.png" - "../shared/images/slider_handle.png" - "../shared/images/tab.png" -) - -qt6_add_resources(text "shared" - PREFIX - "/shared" - BASE - "../shared" - FILES - ${shared_resource_files} -) - -install(TARGETS text - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/quickcontrols2/gallery/.prev_CMakeLists.txt b/examples/quickcontrols2/gallery/.prev_CMakeLists.txt deleted file mode 100644 index 9cf56d6ac0..0000000000 --- a/examples/quickcontrols2/gallery/.prev_CMakeLists.txt +++ /dev/null @@ -1,110 +0,0 @@ -# Generated from gallery.pro. - -cmake_minimum_required(VERSION 3.14) -project(gallery 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") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/gallery") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS QuickControls2) - -qt_add_executable(gallery - gallery.cpp -) -set_target_properties(gallery PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(gallery PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickControls2 -) - - -# Resources: -set(qmake_immediate_resource_files - "+Material/ToolBar.qml" - "ToolBar.qml" - "gallery.qml" - "icons/gallery/20x20/back.png" - "icons/gallery/20x20/drawer.png" - "icons/gallery/20x20/menu.png" - "icons/gallery/20x20@2/back.png" - "icons/gallery/20x20@2/drawer.png" - "icons/gallery/20x20@2/menu.png" - "icons/gallery/20x20@3/back.png" - "icons/gallery/20x20@3/drawer.png" - "icons/gallery/20x20@3/menu.png" - "icons/gallery/20x20@4/back.png" - "icons/gallery/20x20@4/drawer.png" - "icons/gallery/20x20@4/menu.png" - "icons/gallery/index.theme" - "images/arrow.png" - "images/arrow@2x.png" - "images/arrow@3x.png" - "images/arrow@4x.png" - "images/arrows.png" - "images/arrows@2x.png" - "images/arrows@3x.png" - "images/arrows@4x.png" - "images/qt-logo.png" - "images/qt-logo@2x.png" - "images/qt-logo@3x.png" - "images/qt-logo@4x.png" - "pages/BusyIndicatorPage.qml" - "pages/ButtonPage.qml" - "pages/CheckBoxPage.qml" - "pages/ComboBoxPage.qml" - "pages/DelayButtonPage.qml" - "pages/DelegatePage.qml" - "pages/DialPage.qml" - "pages/DialogPage.qml" - "pages/FramePage.qml" - "pages/GroupBoxPage.qml" - "pages/PageIndicatorPage.qml" - "pages/ProgressBarPage.qml" - "pages/RadioButtonPage.qml" - "pages/RangeSliderPage.qml" - "pages/ScrollBarPage.qml" - "pages/ScrollIndicatorPage.qml" - "pages/ScrollablePage.qml" - "pages/SliderPage.qml" - "pages/SpinBoxPage.qml" - "pages/StackViewPage.qml" - "pages/SwipeViewPage.qml" - "pages/SwitchPage.qml" - "pages/TabBarPage.qml" - "pages/TextAreaPage.qml" - "pages/TextFieldPage.qml" - "pages/ToolTipPage.qml" - "pages/TumblerPage.qml" - "qmldir" - "qtquickcontrols2.conf" -) - -qt6_add_resources(gallery "qmake_immediate" - PREFIX - "/" - FILES - ${qmake_immediate_resource_files} -) - -install(TARGETS gallery - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/quickcontrols2/texteditor/.prev_CMakeLists.txt b/examples/quickcontrols2/texteditor/.prev_CMakeLists.txt deleted file mode 100644 index a30753538d..0000000000 --- a/examples/quickcontrols2/texteditor/.prev_CMakeLists.txt +++ /dev/null @@ -1,73 +0,0 @@ -# Generated from texteditor.pro. - -cmake_minimum_required(VERSION 3.14) -project(texteditor 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") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/texteditor") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS QuickControls2) - -qt_add_executable(texteditor - documenthandler.cpp documenthandler.h - texteditor.cpp -) -set_target_properties(texteditor PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(texteditor PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::QuickControls2 -) - - -# Resources: -set(texteditor_resource_files - "+touch/texteditor.html" - "fonts/fontello.ttf" - "images/qt-logo.png" - "qml/+touch/texteditor.qml" - "qml/texteditor.qml" - "qtquickcontrols2.conf" - "texteditor.html" -) - -qt6_add_resources(texteditor "texteditor" - PREFIX - "/" - FILES - ${texteditor_resource_files} -) - -if(TARGET Qt::Widgets) - target_link_libraries(texteditor PUBLIC - Qt::Widgets - ) -endif() - -if(CMAKE_CROSSCOMPILING) - target_compile_definitions(texteditor PUBLIC - QT_EXTRA_FILE_SELECTOR=\\\"touch\\\" - ) -endif() - -install(TARGETS texteditor - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) -- cgit v1.2.3