diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 15:00:38 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 09:05:48 +0000 |
| commit | e9a58ba9e55467f8c69e19dd52c2afa7cbb39529 (patch) | |
| tree | 0d9d92641192c7bc7ca7c6d451d7d123d80ea6bb /src/opengl | |
| parent | 38354d7d6132344a322751c91202109d847771b9 (diff) | |
Regenerate src/*
Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/.prev_CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/opengl/CMakeLists.txt | 8 |
2 files changed, 8 insertions, 17 deletions
diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt index 2844fac32d..85e382fa16 100644 --- a/src/opengl/.prev_CMakeLists.txt +++ b/src/opengl/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## OpenGL Module: ##################################################################### -add_qt_module(OpenGL +qt_add_module(OpenGL SOURCES gl2paintengineex/qgl2pexvertexarray.cpp gl2paintengineex/qgl2pexvertexarray_p.h gl2paintengineex/qglcustomshaderstage.cpp gl2paintengineex/qglcustomshaderstage_p.h @@ -36,13 +36,10 @@ add_qt_module(OpenGL Qt::Widgets ) -#### Keys ignored in scope 1:.:.:opengl.pro:<TRUE>: -# _LOADED = "qt_module" - ## Scopes: ##################################################################### -extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x63000000" ) @@ -50,17 +47,11 @@ extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") #### Keys ignored in scope 3:.:.:opengl.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -#### Keys ignored in scope 4:.:.:opengl.pro:QT_FEATURE_opengl: -# CONFIG = "opengl" - -#### Keys ignored in scope 5:.:.:opengl.pro:QT_FEATURE_opengles2: -# CONFIG = "opengles2" - -extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect +qt_extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect SOURCES qgraphicsshadereffect.cpp qgraphicsshadereffect_p.h ) -add_qt_docs( +qt_add_docs(OpenGL doc/qtopengl.qdocconf ) diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index 3714e8705f..85e382fa16 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -4,7 +4,7 @@ ## OpenGL Module: ##################################################################### -add_qt_module(OpenGL +qt_add_module(OpenGL SOURCES gl2paintengineex/qgl2pexvertexarray.cpp gl2paintengineex/qgl2pexvertexarray_p.h gl2paintengineex/qglcustomshaderstage.cpp gl2paintengineex/qglcustomshaderstage_p.h @@ -39,7 +39,7 @@ add_qt_module(OpenGL ## Scopes: ##################################################################### -extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x63000000" ) @@ -47,11 +47,11 @@ extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") #### Keys ignored in scope 3:.:.:opengl.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect +qt_extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect SOURCES qgraphicsshadereffect.cpp qgraphicsshadereffect_p.h ) -add_qt_docs(OpenGL +qt_add_docs(OpenGL doc/qtopengl.qdocconf ) |