diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-27 13:25:34 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-30 20:45:08 +0000 |
commit | 43d2b60a29df5397be4b4bead90f40346bf85dce (patch) | |
tree | 7ac735998206e9ed76eca98d335490ad5d98bd1f | |
parent | a1dbdcbd6e818118f5fc28cdd39e47a02380adbd (diff) |
Post-merge fixes
Change-Id: I6acd29103f6cc550544e7422328d97ea0e2dcafb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
23 files changed, 151 insertions, 88 deletions
diff --git a/examples/gui/CMakeLists.txt b/examples/gui/CMakeLists.txt index 7ae4c6bc6a..7631777ef4 100644 --- a/examples/gui/CMakeLists.txt +++ b/examples/gui/CMakeLists.txt @@ -1,8 +1,7 @@ # Generated from gui.pro. +if(NOT TARGET Qt::Gui) + return() +endif() add_subdirectory(analogclock) add_subdirectory(rasterwindow) - -if(TARGET Qt::Gui AND QT_FEATURE_opengl) - add_subdirectory(openglwindow) -endif() diff --git a/examples/opengl/CMakeLists.txt b/examples/opengl/CMakeLists.txt index 53f6329463..3d5b055b1a 100644 --- a/examples/opengl/CMakeLists.txt +++ b/examples/opengl/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(hellowindow) add_subdirectory(paintedwindow) +add_subdirectory(openglwindow) add_subdirectory(qopenglwindow) if(TARGET Qt::Widgets) add_subdirectory(contextinfo) diff --git a/examples/opengl/openglwindow/.prev_CMakeLists.txt b/examples/opengl/openglwindow/.prev_CMakeLists.txt new file mode 100644 index 0000000000..9780e18c7f --- /dev/null +++ b/examples/opengl/openglwindow/.prev_CMakeLists.txt @@ -0,0 +1,36 @@ +# Generated from openglwindow.pro. + +cmake_minimum_required(VERSION 3.14) +project(openglwindow LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/opengl/openglwindow") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS OpenGL) + +add_qt_gui_executable(openglwindow + main.cpp + openglwindow.cpp openglwindow.h +) +target_include_directories(openglwindow PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries(openglwindow PUBLIC + Qt::Core + Qt::Gui + Qt::OpenGL +) + +install(TARGETS openglwindow + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/gui/openglwindow/CMakeLists.txt b/examples/opengl/openglwindow/CMakeLists.txt index 98fc40fd9a..9780e18c7f 100644 --- a/examples/gui/openglwindow/CMakeLists.txt +++ b/examples/opengl/openglwindow/CMakeLists.txt @@ -3,15 +3,17 @@ cmake_minimum_required(VERSION 3.14) project(openglwindow LANGUAGES CXX) -find_package(Qt6 COMPONENTS Widgets) # special case: add - set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/opengl/openglwindow") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS OpenGL) add_qt_gui_executable(openglwindow main.cpp @@ -20,11 +22,13 @@ add_qt_gui_executable(openglwindow target_include_directories(openglwindow PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) -# special case begin + target_link_libraries(openglwindow PUBLIC + Qt::Core Qt::Gui + Qt::OpenGL ) -# special case end + install(TARGETS openglwindow RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/opengl/paintedwindow/CMakeLists.txt b/examples/opengl/paintedwindow/CMakeLists.txt index 6d36a0e001..2711bdc45b 100644 --- a/examples/opengl/paintedwindow/CMakeLists.txt +++ b/examples/opengl/paintedwindow/CMakeLists.txt @@ -13,6 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples/opengl/paintedwindow") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS OpenGL) add_qt_gui_executable(paintedwindow main.cpp @@ -21,6 +22,7 @@ add_qt_gui_executable(paintedwindow target_link_libraries(paintedwindow PUBLIC Qt::Core Qt::Gui + Qt::OpenGL ) install(TARGETS paintedwindow diff --git a/examples/widgets/windowcontainer/CMakeLists.txt b/examples/widgets/windowcontainer/CMakeLists.txt index 463fe8f8a6..399cade1c5 100644 --- a/examples/widgets/windowcontainer/CMakeLists.txt +++ b/examples/widgets/windowcontainer/CMakeLists.txt @@ -9,18 +9,25 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/widgets/windowcontainer") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS OpenGL) add_qt_gui_executable(windowcontainer - ../../gui/openglwindow/openglwindow.cpp ../../gui/openglwindow/openglwindow.h + ../../opengl/openglwindow/openglwindow.cpp ../../opengl/openglwindow/openglwindow.h windowcontainer.cpp ) target_include_directories(windowcontainer PUBLIC - ../../gui/openglwindow + ../../opengl/openglwindow ) + target_link_libraries(windowcontainer PUBLIC + Qt::Core + Qt::Gui + Qt::OpenGL Qt::Widgets ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bb2b8a6ee2..ea62fa8b34 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,14 +35,12 @@ if(QT_FEATURE_gui) add_subdirectory(gui) if(QT_FEATURE_opengl) + add_subdirectory(opengl) add_subdirectory(openglextensions) endif() if(QT_FEATURE_widgets) add_subdirectory(widgets) - if(QT_FEATURE_opengl) - add_subdirectory(opengl) - endif() endif() add_subdirectory(platformsupport) add_subdirectory(platformheaders) diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 5c287261fb..a6e862e1de 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -194,6 +194,7 @@ qt_add_module(Core tools/qcontainertools_impl.h tools/qcontiguouscache.cpp tools/qcontiguouscache.h tools/qcryptographichash.cpp tools/qcryptographichash.h + tools/qduplicatetracker_p.h tools/qflatmap_p.h tools/qfreelist.cpp tools/qfreelist_p.h tools/qhash.cpp tools/qhash.h @@ -612,17 +613,18 @@ qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXW m ) -qt_extend_target(Core CONDITION APPLE_OSX AND NOT NACL +qt_extend_target(Core CONDITION APPLE AND NOT NACL SOURCES + kernel/qelapsedtimer_mac.cpp text/qlocale_mac.mm ) -qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE_OSX) +qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE) SOURCES text/qlocale_unix.cpp ) -qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE_OSX) +qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE) SOURCES text/qlocale_win.cpp ) @@ -894,11 +896,6 @@ qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library ${CMAKE_DL_LIBS} ) -qt_extend_target(Core CONDITION APPLE AND NOT NACL - SOURCES - kernel/qelapsedtimer_mac.cpp -) - qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS) LIBRARIES ${FWUIKit} diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 5a0ef2eb4d..ca53e47ac3 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -208,6 +208,7 @@ qt_add_module(Core tools/qcontainertools_impl.h tools/qcontiguouscache.cpp tools/qcontiguouscache.h tools/qcryptographichash.cpp tools/qcryptographichash.h + tools/qduplicatetracker_p.h tools/qflatmap_p.h tools/qfreelist.cpp tools/qfreelist_p.h tools/qhash.cpp tools/qhash.h @@ -688,17 +689,18 @@ qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXW m ) -qt_extend_target(Core CONDITION APPLE_OSX AND NOT NACL +qt_extend_target(Core CONDITION APPLE AND NOT NACL SOURCES + kernel/qelapsedtimer_mac.cpp text/qlocale_mac.mm ) -qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE_OSX) +qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE) SOURCES text/qlocale_unix.cpp ) -qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE_OSX) +qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE) SOURCES text/qlocale_win.cpp ) @@ -970,11 +972,6 @@ qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library ${CMAKE_DL_LIBS} ) -qt_extend_target(Core CONDITION APPLE AND NOT NACL - SOURCES - kernel/qelapsedtimer_mac.cpp -) - qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS) LIBRARIES ${FWUIKit} diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 75af1f1960..14f17d832e 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -253,28 +253,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h - opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h - opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h - opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h - opengl/qopenglengineshadersource_p.h opengl/qopenglextensions_p.h opengl/qopenglextrafunctions.h opengl/qopenglframebufferobject.cpp opengl/qopenglframebufferobject.h opengl/qopenglframebufferobject_p.h opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h - opengl/qopenglgradientcache.cpp opengl/qopenglgradientcache_p.h - opengl/qopenglpaintdevice.cpp opengl/qopenglpaintdevice.h opengl/qopenglpaintdevice_p.h - opengl/qopenglpaintengine.cpp opengl/qopenglpaintengine_p.h - opengl/qopenglpixeltransferoptions.cpp opengl/qopenglpixeltransferoptions.h opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h - opengl/qopenglshadercache_p.h opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h - opengl/qopengltexture.cpp opengl/qopengltexture.h opengl/qopengltexture_p.h opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h - opengl/qopengltexturecache.cpp opengl/qopengltexturecache_p.h - opengl/qopengltextureglyphcache.cpp opengl/qopengltextureglyphcache_p.h - opengl/qopengltexturehelper.cpp opengl/qopengltexturehelper_p.h - opengl/qopengltextureuploader.cpp opengl/qopengltextureuploader_p.h opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 3c8f35f467..c5d7c73a49 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -335,28 +335,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h - opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h - opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h - opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h - opengl/qopenglengineshadersource_p.h opengl/qopenglextensions_p.h opengl/qopenglextrafunctions.h opengl/qopenglframebufferobject.cpp opengl/qopenglframebufferobject.h opengl/qopenglframebufferobject_p.h opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h - opengl/qopenglgradientcache.cpp opengl/qopenglgradientcache_p.h - opengl/qopenglpaintdevice.cpp opengl/qopenglpaintdevice.h opengl/qopenglpaintdevice_p.h - opengl/qopenglpaintengine.cpp opengl/qopenglpaintengine_p.h - opengl/qopenglpixeltransferoptions.cpp opengl/qopenglpixeltransferoptions.h opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h - opengl/qopenglshadercache_p.h opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h - opengl/qopengltexture.cpp opengl/qopengltexture.h opengl/qopengltexture_p.h opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h - opengl/qopengltexturecache.cpp opengl/qopengltexturecache_p.h - opengl/qopengltextureglyphcache.cpp opengl/qopengltextureglyphcache_p.h - opengl/qopengltexturehelper.cpp opengl/qopengltexturehelper_p.h - opengl/qopengltextureuploader.cpp opengl/qopengltextureuploader_p.h opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt index 85e382fa16..fdd0ff7beb 100644 --- a/src/opengl/.prev_CMakeLists.txt +++ b/src/opengl/.prev_CMakeLists.txt @@ -6,22 +6,22 @@ qt_add_module(OpenGL SOURCES - gl2paintengineex/qgl2pexvertexarray.cpp gl2paintengineex/qgl2pexvertexarray_p.h - gl2paintengineex/qglcustomshaderstage.cpp gl2paintengineex/qglcustomshaderstage_p.h - gl2paintengineex/qglengineshadermanager.cpp gl2paintengineex/qglengineshadermanager_p.h - gl2paintengineex/qglengineshadersource_p.h - gl2paintengineex/qglgradientcache.cpp gl2paintengineex/qglgradientcache_p.h - gl2paintengineex/qglshadercache_p.h - gl2paintengineex/qpaintengineex_opengl2.cpp gl2paintengineex/qpaintengineex_opengl2_p.h - gl2paintengineex/qtextureglyphcache_gl.cpp gl2paintengineex/qtextureglyphcache_gl_p.h - qgl.cpp qgl.h qgl_p.h - qglbuffer.cpp qglbuffer.h - qglcolormap.cpp qglcolormap.h - qglframebufferobject.cpp qglframebufferobject.h qglframebufferobject_p.h - qglfunctions.cpp qglfunctions.h - qglpaintdevice.cpp qglpaintdevice_p.h - qglpixelbuffer.cpp qglpixelbuffer.h qglpixelbuffer_p.h - qglshaderprogram.cpp qglshaderprogram.h + qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h + qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h + qopengldebug.cpp qopengldebug.h + qopenglengineshadermanager.cpp qopenglengineshadermanager_p.h + qopenglengineshadersource_p.h + qopenglgradientcache.cpp qopenglgradientcache_p.h + qopenglpaintdevice.cpp qopenglpaintdevice.h qopenglpaintdevice_p.h + qopenglpaintengine.cpp qopenglpaintengine_p.h + qopenglpixeltransferoptions.cpp qopenglpixeltransferoptions.h + qopenglshadercache_p.h + qopengltexture.cpp qopengltexture.h qopengltexture_p.h + qopengltexturecache.cpp qopengltexturecache_p.h + qopengltextureglyphcache.cpp qopengltextureglyphcache_p.h + qopengltexturehelper.cpp qopengltexturehelper_p.h + qopengltextureuploader.cpp qopengltextureuploader_p.h + qopenglwindow.cpp qopenglwindow.h qtopenglglobal.h DEFINES QT_NO_FOREACH @@ -29,27 +29,27 @@ qt_add_module(OpenGL LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::Widgets ) ## Scopes: ##################################################################### -qt_extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") - LINK_OPTIONS - "/BASE:0x63000000" +qt_extend_target(OpenGL CONDITION QT_FEATURE_widgets + SOURCES + qopenglwidget.cpp qopenglwidget.h + LIBRARIES + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Widgets ) -#### Keys ignored in scope 3:.:.:opengl.pro:solaris-cc_x_: -# QMAKE_CXXFLAGS_RELEASE = "--O2" - -qt_extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect +qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2 SOURCES - qgraphicsshadereffect.cpp qgraphicsshadereffect_p.h + qopenglqueryhelper_p.h + qopengltimerquery.cpp qopengltimerquery.h ) qt_add_docs(OpenGL doc/qtopengl.qdocconf diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index d490aa4970..fdd0ff7beb 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -6,7 +6,21 @@ qt_add_module(OpenGL SOURCES + qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h + qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h qopengldebug.cpp qopengldebug.h + qopenglengineshadermanager.cpp qopenglengineshadermanager_p.h + qopenglengineshadersource_p.h + qopenglgradientcache.cpp qopenglgradientcache_p.h + qopenglpaintdevice.cpp qopenglpaintdevice.h qopenglpaintdevice_p.h + qopenglpaintengine.cpp qopenglpaintengine_p.h + qopenglpixeltransferoptions.cpp qopenglpixeltransferoptions.h + qopenglshadercache_p.h + qopengltexture.cpp qopengltexture.h qopengltexture_p.h + qopengltexturecache.cpp qopengltexturecache_p.h + qopengltextureglyphcache.cpp qopengltextureglyphcache_p.h + qopengltexturehelper.cpp qopengltexturehelper_p.h + qopengltextureuploader.cpp qopengltextureuploader_p.h qopenglwindow.cpp qopenglwindow.h qtopenglglobal.h DEFINES diff --git a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt index 070a0ee35f..b283b6df4d 100644 --- a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt @@ -24,3 +24,11 @@ qt_add_module(VulkanSupport #### Keys ignored in scope 1:.:.:vkconvenience.pro:<TRUE>: # MODULE = "vulkan_support" + +## Scopes: +##################################################################### + +qt_extend_target(VulkanSupport CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt index 99435d1f55..521fa098ea 100644 --- a/src/platformsupport/vkconvenience/CMakeLists.txt +++ b/src/platformsupport/vkconvenience/CMakeLists.txt @@ -26,3 +26,11 @@ qt_add_module(VulkanSupport #### Keys ignored in scope 1:.:.:vkconvenience.pro:<TRUE>: # MODULE = "vulkan_support" + +## Scopes: +##################################################################### + +qt_extend_target(VulkanSupport CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt index c7bf3f7c7c..8f04c3fba0 100644 --- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt @@ -37,6 +37,8 @@ qt_add_plugin(QMinimalEglIntegrationPlugin qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h + PUBLIC_LIBRARIES + Qt::OpenGL ) #### Keys ignored in scope 3:.:.:minimalegl.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index 7c549a416b..79cc6bddc6 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -38,6 +38,8 @@ qt_add_plugin(QMinimalEglIntegrationPlugin qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h + PUBLIC_LIBRARIES + Qt::OpenGL ) #### Keys ignored in scope 3:.:.:minimalegl.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/tests/auto/gui/qopengl/CMakeLists.txt b/tests/auto/gui/qopengl/CMakeLists.txt index d488c808f9..30c1ec94b3 100644 --- a/tests/auto/gui/qopengl/CMakeLists.txt +++ b/tests/auto/gui/qopengl/CMakeLists.txt @@ -12,6 +12,7 @@ add_qt_test(tst_qopengl Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::OpenGL ) ## Scopes: diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt index 974112a5ad..f06586d3d4 100644 --- a/tests/auto/other/lancelot/CMakeLists.txt +++ b/tests/auto/other/lancelot/CMakeLists.txt @@ -73,8 +73,13 @@ add_qt_resource(tst_lancelot "images" ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:WIN32: +extend_target(tst_lancelot CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) + +#### Keys ignored in scope 4:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:WIN32: # MKSPEC = "$$replace(QMAKESPEC, \\\\, /)" -#### Keys ignored in scope 4:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:else: +#### Keys ignored in scope 5:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:else: # MKSPEC = "$$QMAKESPEC" diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 37088f8495..1f5bb2dff8 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -10,6 +10,7 @@ add_qt_test(tst_qopenglwidget LIBRARIES Qt::CorePrivate Qt::GuiPrivate + Qt::OpenGLPrivate PUBLIC_LIBRARIES Qt::Gui Qt::OpenGL diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt index e3b60c0827..a4c673af9b 100644 --- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt @@ -148,3 +148,11 @@ add_qt_resource(tst_bench_lancebench "images" #### Keys ignored in scope 1:.:.:lancebench.pro:<TRUE>: # TEMPLATE = "app" # TESTDATA = "../../../../auto/other/lancelot/scripts/*" + +## Scopes: +##################################################################### + +extend_target(tst_bench_lancebench CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt index 14d702dc7f..2c18c56d36 100644 --- a/tests/manual/qopengltextureblitter/CMakeLists.txt +++ b/tests/manual/qopengltextureblitter/CMakeLists.txt @@ -15,6 +15,7 @@ add_qt_manual_test(qopengltextureblitter Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::OpenGL # special case ) #### Keys ignored in scope 1:.:.:qopengltextureblitter.pro:<TRUE>: diff --git a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp index f4e093a967..f8e033c927 100644 --- a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp +++ b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp @@ -29,7 +29,7 @@ #include "qopengltextureblitwindow.h" #include <QtGui/QPainter> -#include <QtGui/QOpenGLTexture> +#include <QtOpenGL/QOpenGLTexture> #include <QtGui/QOpenGLFunctions> #include <QtGui/QMatrix4x4> |