diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-04 22:57:36 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-05 07:39:14 +0000 |
commit | 891c897b801c86eaf4c4daea5fab3f2d510fbbe8 (patch) | |
tree | fd40443526e11f262b18334fda69d6fb6b5d0d5b /src/opengl | |
parent | 9231204e2ccab611af0df9a18761cd601ba20e92 (diff) |
Regenerate the main qtbase modules
There were some changes done in pro2cmake, so regenerate the main
qtbase modules to keep everything up to date.
Some new whitespace got added.
Some special cases were removed (ZLIB).
Some opengl code got moved around.
Some plugin types were added.
And some other minor things.
Change-Id: Ie8cba4a9aa6b4b163c39d6cf546ea9e0bfc05c01
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 | 1 | ||||
-rw-r--r-- | src/opengl/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt index 759b1a7083..2844fac32d 100644 --- a/src/opengl/.prev_CMakeLists.txt +++ b/src/opengl/.prev_CMakeLists.txt @@ -63,3 +63,4 @@ extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect add_qt_docs( doc/qtopengl.qdocconf ) + diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index af77dde8a2..53a59b3434 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -64,3 +64,4 @@ extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect add_qt_docs( doc/qtopengl.qdocconf ) + |