Post-merge fixes

Change-Id: I6acd29103f6cc550544e7422328d97ea0e2dcafb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-01-27 13:25:34 +01:00
parent a1dbdcbd6e
commit 43d2b60a29
23 changed files with 151 additions and 88 deletions

View File

@ -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()

View File

@ -2,6 +2,7 @@
add_subdirectory(hellowindow)
add_subdirectory(paintedwindow)
add_subdirectory(openglwindow)
add_subdirectory(qopenglwindow)
if(TARGET Qt::Widgets)
add_subdirectory(contextinfo)

View File

@ -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}"
)

View File

@ -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}"

View File

@ -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

View File

@ -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
)

View File

@ -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)

View File

@ -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}

View File

@ -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}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
)

View File

@ -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
)

View File

@ -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:

View File

@ -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:

View File

@ -12,6 +12,7 @@ add_qt_test(tst_qopengl
Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
Qt::OpenGL
)
## Scopes:

View File

@ -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"

View File

@ -10,6 +10,7 @@ add_qt_test(tst_qopenglwidget
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::OpenGLPrivate
PUBLIC_LIBRARIES
Qt::Gui
Qt::OpenGL

View File

@ -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
)

View File

@ -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>:

View File

@ -29,7 +29,7 @@
#include "qopengltextureblitwindow.h"
#include <QtGui/QPainter>
#include <QtGui/QOpenGLTexture>
#include <QtOpenGL/QOpenGLTexture>
#include <QtGui/QOpenGLFunctions>
#include <QtGui/QMatrix4x4>