diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-10-16 12:13:03 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-10-20 13:36:56 +0300 |
| commit | 54a6382d0d26ed0854eea673d5dbf9d971fbeb3b (patch) | |
| tree | bc30041b6cd33dfe1f4cd8fce52c60df6b4e94aa | |
| parent | 75ad2afcd8f14dee12b442aae8b7b09b6acc5da4 (diff) | |
| download | qtgraphicaleffects-54a6382d0d26ed0854eea673d5dbf9d971fbeb3b.tar.gz | |
Remove requirement for opengl
The effects have been ported to RHI and there is no more hard dependency
to opengl.
Change-Id: Ib3c3a5086f8f8f9823b447f407618a8b1e6c7be9
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| -rw-r--r-- | .cmake.conf | 1 | ||||
| -rw-r--r-- | .prev_CMakeLists.txt | 7 | ||||
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | qtgraphicaleffects.pro | 1 |
4 files changed, 5 insertions, 11 deletions
diff --git a/.cmake.conf b/.cmake.conf new file mode 100644 index 0000000..9305480 --- /dev/null +++ b/.cmake.conf @@ -0,0 +1 @@ +set(QT_REPO_MODULE_VERSION "6.0.0") diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt index 50cd55d..60c00c0 100644 --- a/.prev_CMakeLists.txt +++ b/.prev_CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(graphicaleffects_FIXME - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt graphicaleffects_FIXME Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C @@ -16,8 +17,4 @@ if(NOT TARGET Qt::Quick) message(NOTICE "Skipping the build as the condition \"TARGET Qt::Quick\" is not met.") return() endif() -if(NOT QT_CONFIG___contains___opengl) - message(NOTICE "Skipping the build as the condition \"QT_CONFIG___contains___opengl\" is not met.") - return() -endif() qt_build_repo() diff --git a/CMakeLists.txt b/CMakeLists.txt index 19d18e6..e7de02e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(QtGraphicalEffects # special case - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt Graphical Effects" # special case HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C @@ -15,8 +16,4 @@ if(NOT TARGET Qt::Quick) message(NOTICE "Skipping the build as the condition \"TARGET Qt::Quick\" is not met.") return() endif() -if(NOT QT_FEATURE_opengl) # special case - message(NOTICE "Skipping the build as the condition \"QT_FEATURE_opengl\" is not met.") # special case - return() -endif() qt_build_repo() diff --git a/qtgraphicaleffects.pro b/qtgraphicaleffects.pro index 9358333..960aa69 100644 --- a/qtgraphicaleffects.pro +++ b/qtgraphicaleffects.pro @@ -1,5 +1,4 @@ requires(qtHaveModule(quick)) -requires(contains(QT_CONFIG, opengl)) qtHaveModule(quick) { QT_FOR_CONFIG += quick-private |