diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 10:42:05 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:29:18 +0000 |
| commit | 48c82e90af12da74c713665ddfd7f8d825ae5bdb (patch) | |
| tree | 0efa87b0cd1b00c47fce0b566a7a0cbb35fed786 /examples/widgets/graphicsview | |
| parent | 502d3d6744913899da87acfda5ebdab42c40329e (diff) | |
| download | qtbase-48c82e90af12da74c713665ddfd7f8d825ae5bdb.tar.gz | |
Post Merge Fixes
Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/widgets/graphicsview')
| -rw-r--r-- | examples/widgets/graphicsview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/widgets/graphicsview/boxes/CMakeLists.txt | 39 |
2 files changed, 0 insertions, 43 deletions
diff --git a/examples/widgets/graphicsview/CMakeLists.txt b/examples/widgets/graphicsview/CMakeLists.txt index 19f60011e5..d7ef0fd0dc 100644 --- a/examples/widgets/graphicsview/CMakeLists.txt +++ b/examples/widgets/graphicsview/CMakeLists.txt @@ -14,7 +14,3 @@ add_subdirectory(flowlayout) add_subdirectory(anchorlayout) add_subdirectory(simpleanchorlayout) add_subdirectory(weatheranchorlayout) - -if(TARGET Qt::OpenGL AND NOT QT_FEATURE_opengles2 AND NOT QT_FEATURE_dynamicgl) - add_subdirectory(boxes) -endif() diff --git a/examples/widgets/graphicsview/boxes/CMakeLists.txt b/examples/widgets/graphicsview/boxes/CMakeLists.txt deleted file mode 100644 index 0be040f90e..0000000000 --- a/examples/widgets/graphicsview/boxes/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Generated from boxes.pro. - -cmake_minimum_required(VERSION 3.14) -project(boxes LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -set(INSTALL_EXAMPLEDIR "examples") - -find_package(Qt6 COMPONENTS OpenGL) -find_package(Qt6 COMPONENTS Widgets) - - -add_qt_gui_executable(boxes - 3rdparty/fbm.c 3rdparty/fbm.h - boxes.qrc - glbuffers.cpp glbuffers.h - glextensions.cpp glextensions.h - gltrianglemesh.h - main.cpp - qtbox.cpp qtbox.h - roundedbox.cpp roundedbox.h - scene.cpp scene.h - trackball.cpp trackball.h -) -target_link_libraries(boxes PUBLIC - Qt::OpenGL - Qt::Widgets -) - -install(TARGETS boxes - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) |