From 6c56ed31ad32a8e76fc55374bbd3961134c6b01a Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 8 Aug 2019 15:43:57 +0200 Subject: Initial CMake port Task-number: QTBUG-75999 Change-Id: Id47cd7a769a27a6776ced0ce92b89a8bdf4f7da1 Reviewed-by: Simon Hausmann --- CMakeLists.txt | 11 +++ src/CMakeLists.txt | 3 + src/effects/CMakeLists.txt | 137 +++++++++++++++++++++++++++++++ src/effects/private/.prev_CMakeLists.txt | 58 +++++++++++++ src/effects/private/CMakeLists.txt | 59 +++++++++++++ tests/CMakeLists.txt | 4 + tests/auto/CMakeLists.txt | 19 +++++ tests/auto/tst_qtgraphicaleffects.cpp | 1 + tests/manual/CMakeLists.txt | 3 + tests/manual/smooth/CMakeLists.txt | 45 ++++++++++ 10 files changed, 340 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 src/CMakeLists.txt create mode 100644 src/effects/CMakeLists.txt create mode 100644 src/effects/private/.prev_CMakeLists.txt create mode 100644 src/effects/private/CMakeLists.txt create mode 100644 tests/CMakeLists.txt create mode 100644 tests/auto/CMakeLists.txt create mode 100644 tests/manual/CMakeLists.txt create mode 100644 tests/manual/smooth/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..d5aaa34 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.15.0) + +project(QtGraphicalEffects + VERSION 6.0.0 + DESCRIPTION "Qt Graphical Effects" + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Quick) +qt_build_repo() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..b344062 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,3 @@ +# Generated from src.pro. + +add_subdirectory(effects) diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt new file mode 100644 index 0000000..31a30b1 --- /dev/null +++ b/src/effects/CMakeLists.txt @@ -0,0 +1,137 @@ +# Generated from effects.pro. + +##################################################################### +## qtgraphicaleffectsplugin Plugin: +##################################################################### + +add_qml_module(qtgraphicaleffectsplugin + CPP_PLUGIN + URI "QtGraphicalEffects" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" + SOURCES + plugin.cpp + PUBLIC_LIBRARIES + Qt::Qml + Qt::Quick +) + +# Resources: +add_qt_resource(qtgraphicaleffectsplugin "qtgraphicaleffectsshaders" + PREFIX + "/qt-project.org/imports/QtGraphicalEffects" + FILES + shaders/+glslcore/brightnesscontrast.frag + shaders/+glslcore/colorize.frag + shaders/+glslcore/coloroverlay.frag + shaders/+glslcore/conicalgradient_mask.frag + shaders/+glslcore/conicalgradient_nomask.frag + shaders/+glslcore/desaturate.frag + shaders/+glslcore/displace.frag + shaders/+glslcore/fastblur.frag + shaders/+glslcore/fastblur_internal.frag + shaders/+glslcore/fastblur_internal.vert + shaders/+glslcore/fastglow.frag + shaders/+glslcore/fastinnershadow.frag + shaders/+glslcore/fastinnershadow_level0.frag + shaders/+glslcore/fastmaskedblur.frag + shaders/+glslcore/gammaadjust.frag + shaders/+glslcore/gaussianinnershadow.frag + shaders/+glslcore/gaussianinnershadow_shadow.frag + shaders/+glslcore/huesaturation.frag + shaders/+glslcore/leveladjust.frag + shaders/+glslcore/lineargradient.vert + shaders/+glslcore/lineargradient_mask.frag + shaders/+glslcore/lineargradient_nomask.frag + shaders/+glslcore/opacitymask.frag + shaders/+glslcore/opacitymask_invert.frag + shaders/+glslcore/radialgradient.vert + shaders/+glslcore/radialgradient_mask.frag + shaders/+glslcore/radialgradient_nomask.frag + shaders/+glslcore/rectangularglow.frag + shaders/+glslcore/recursiveblur.frag + shaders/+glslcore/recursiveblur.vert + shaders/+glslcore/thresholdmask.frag + shaders/brightnesscontrast.frag + shaders/colorize.frag + shaders/coloroverlay.frag + shaders/conicalgradient_mask.frag + shaders/conicalgradient_nomask.frag + shaders/desaturate.frag + shaders/displace.frag + shaders/fastblur.frag + shaders/fastblur_internal.frag + shaders/fastblur_internal.vert + shaders/fastglow.frag + shaders/fastinnershadow.frag + shaders/fastinnershadow_level0.frag + shaders/fastmaskedblur.frag + shaders/gammaadjust.frag + shaders/gaussianinnershadow.frag + shaders/gaussianinnershadow_shadow.frag + shaders/huesaturation.frag + shaders/leveladjust.frag + shaders/lineargradient.vert + shaders/lineargradient_mask.frag + shaders/lineargradient_nomask.frag + shaders/opacitymask.frag + shaders/opacitymask_invert.frag + shaders/radialgradient.vert + shaders/radialgradient_mask.frag + shaders/radialgradient_nomask.frag + shaders/rectangularglow.frag + shaders/recursiveblur.frag + shaders/recursiveblur.vert + shaders/thresholdmask.frag +) + + +set(qml_files + Blend.qml + BrightnessContrast.qml + ColorOverlay.qml + Colorize.qml + ConicalGradient.qml + Desaturate.qml + DirectionalBlur.qml + Displace.qml + DropShadow.qml + FastBlur.qml + GammaAdjust.qml + GaussianBlur.qml + Glow.qml + HueSaturation.qml + InnerShadow.qml + LevelAdjust.qml + LinearGradient.qml + MaskedBlur.qml + OpacityMask.qml + RadialBlur.qml + RadialGradient.qml + RectangularGlow.qml + RecursiveBlur.qml + ThresholdMask.qml + ZoomBlur.qml +) + +add_qt_resource(qtgraphicaleffectsplugin qmake_QtGraphicalEffects + PREFIX + "/qt-project.org/imports/QtGraphicalEffects" + FILES + ${qml_files} +) + +qt_install_qml_files(qtgraphicaleffectsplugin + FILES ${qml_files} +) + + +#### Keys ignored in scope 2:.:.:effects_plugin.pro:: +# CXX_MODULE = "qml" +# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# _LOADED = "qml_plugin" +add_qt_docs( + doc/qtgraphicaleffects.qdocconf +) + +add_subdirectory(private) diff --git a/src/effects/private/.prev_CMakeLists.txt b/src/effects/private/.prev_CMakeLists.txt new file mode 100644 index 0000000..c609682 --- /dev/null +++ b/src/effects/private/.prev_CMakeLists.txt @@ -0,0 +1,58 @@ +# Generated from private.pro. + +##################################################################### +## qtgraphicaleffectsprivate Plugin: +##################################################################### + +add_qml_module(qtgraphicaleffectsprivate + CPP_PLUGIN + URI "QtGraphicalEffects.private" + RESOURCE_PREFIX "/qt-project.org/imports" + SOURCES + plugin.cpp + qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h + qgfxsourceproxy.cpp qgfxsourceproxy_p.h + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +set(qml_files + DropShadowBase.qml + FastGlow.qml + FastInnerShadow.qml + FastMaskedBlur.qml + GaussianDirectionalBlur.qml + GaussianGlow.qml + GaussianInnerShadow.qml + GaussianMaskedBlur.qml +) + +add_qt_resource(qtgraphicaleffectsprivate qmake_QtGraphicalEffects_private + PREFIX + "/qt-project.org/imports/QtGraphicalEffects/private" + FILES + ${qml_files} +) + +qt_install_qml_files(qtgraphicaleffectsprivate + FILES ${qml_files} +) + + +#### Keys ignored in scope 1:.:.:private.pro:: +# CXX_MODULE = "qml" +# _LOADED = "qml_plugin" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:private.pro:NOT static: +# CONFIG = "qmlcache" diff --git a/src/effects/private/CMakeLists.txt b/src/effects/private/CMakeLists.txt new file mode 100644 index 0000000..c635034 --- /dev/null +++ b/src/effects/private/CMakeLists.txt @@ -0,0 +1,59 @@ +# Generated from private.pro. + +##################################################################### +## qtgraphicaleffectsprivate Plugin: +##################################################################### + +add_qml_module(qtgraphicaleffectsprivate + CPP_PLUGIN + URI "QtGraphicalEffects.private" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" # special case + RESOURCE_PREFIX "/qt-project.org/imports" + SOURCES + plugin.cpp + qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h + qgfxsourceproxy.cpp qgfxsourceproxy_p.h + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +set(qml_files + DropShadowBase.qml + FastGlow.qml + FastInnerShadow.qml + FastMaskedBlur.qml + GaussianDirectionalBlur.qml + GaussianGlow.qml + GaussianInnerShadow.qml + GaussianMaskedBlur.qml +) + +add_qt_resource(qtgraphicaleffectsprivate qmake_QtGraphicalEffects_private + PREFIX + "/qt-project.org/imports/QtGraphicalEffects/private" + FILES + ${qml_files} +) + +qt_install_qml_files(qtgraphicaleffectsprivate + FILES ${qml_files} +) + + +#### Keys ignored in scope 1:.:.:private.pro:: +# CXX_MODULE = "qml" +# _LOADED = "qml_plugin" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:private.pro:NOT static: +# CONFIG = "qmlcache" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..e4f5f7f --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from tests.pro. + +add_subdirectory(manual) +add_subdirectory(auto) diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt new file mode 100644 index 0000000..4fec531 --- /dev/null +++ b/tests/auto/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from auto.pro. + +##################################################################### +## tst_qtgraphicaleffects Test: +##################################################################### + +add_qt_test(tst_qtgraphicaleffects + GUI + SOURCES + tst_qtgraphicaleffects.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Quick +) + +#### Keys ignored in scope 1:.:.:auto.pro:: +# CONFIG = "testcase" +# DISTFILES = "dummy.qml" diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp index 7f26b01..d15453f 100644 --- a/tests/auto/tst_qtgraphicaleffects.cpp +++ b/tests/auto/tst_qtgraphicaleffects.cpp @@ -28,6 +28,7 @@ #include #include +#include #include class tst_qtgraphicaleffects : public QObject diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt new file mode 100644 index 0000000..de858a2 --- /dev/null +++ b/tests/manual/CMakeLists.txt @@ -0,0 +1,3 @@ +# Generated from manual.pro. + +add_subdirectory(smooth) diff --git a/tests/manual/smooth/CMakeLists.txt b/tests/manual/smooth/CMakeLists.txt new file mode 100644 index 0000000..17e88d4 --- /dev/null +++ b/tests/manual/smooth/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from smooth.pro. + +##################################################################### +## smooth Binary: +##################################################################### + +add_qt_executable(smooth + GUI + SOURCES + main.cpp + DEFINES + QT_DEPRECATED_WARNINGS + PUBLIC_LIBRARIES + Qt::Gui + Qt::Quick +) + +# Resources: +add_qt_resource(smooth "resources" + PREFIX + "/" + FILES + CellContainer.qml + SourceImage.qml + main.qml + star.png +) + + +#### Keys ignored in scope 1:.:.:smooth.pro:: +# CONFIG = "c++11" +# QML_DESIGNER_IMPORT_PATH = +# QML_IMPORT_PATH = + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:smooth.pro:QNX: +# target.path = "/tmp/$${TARGET}/bin" + +#### Keys ignored in scope 4:.:.:smooth.pro:UNIX AND NOT ANDROID: +# target.path = "/opt/$${TARGET}/bin" + +#### Keys ignored in scope 5:.:.:smooth.pro:NOT target.path_ISEMPTY: +# INSTALLS = "target" -- cgit v1.2.1 From 813ac231387a48142f8645486d639152b0501194 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 4 Sep 2019 19:33:30 +0200 Subject: Add build and test instructions for the cmake build Change-Id: Id44980471c9e78ef6d7525c4c24de201207b95c9 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- coin/module_config.yaml | 13 +++++++++++++ tests/CMakeLists.txt | 12 +++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 coin/module_config.yaml diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 0000000..9f29e11 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,13 @@ +version: 1 +accept_configuration: + condition: property + property: host.os + equals_property: target.os + +build_instructions: + - !include "{{qt/qtbase}}/prepare_building_env.yaml" + - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml" + - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" + +test_instructions: + - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e4f5f7f..9cb1a65 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,10 @@ -# Generated from tests.pro. +# special case begin +if(NOT TARGET Qt::Test) + cmake_minimum_required(VERSION 3.15.0) + project(QtGraphicalEffectsTests VERSION 6.0.0 LANGUAGES C CXX ASM) + find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Test Qml Quick) + qt_set_up_standalone_tests_build() +endif() +# special case end -add_subdirectory(manual) -add_subdirectory(auto) +qt_build_tests() -- cgit v1.2.1 From 93d9b1e891666137f475223d1855d202f97045b1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 19 Sep 2019 13:52:14 +0200 Subject: Fix cmake configure step MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Re-generate CMakeLists.txt after the declarative cmake API changes. Change-Id: I7e2dd4ed121ce836a83e33c47017b115ad4208dc Reviewed-by: Leander Beernaert Reviewed-by: Mårten Nordheim --- src/effects/CMakeLists.txt | 127 +++++++++++++++++++++++++++---- src/effects/private/.prev_CMakeLists.txt | 57 ++++++++++---- src/effects/private/CMakeLists.txt | 57 ++++++++++---- 3 files changed, 200 insertions(+), 41 deletions(-) diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt index 943a17f..62f3694 100644 --- a/src/effects/CMakeLists.txt +++ b/src/effects/CMakeLists.txt @@ -5,9 +5,13 @@ ##################################################################### add_qml_module(qtgraphicaleffectsplugin - CPP_PLUGIN URI "QtGraphicalEffects" VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + DESIGNER_SUPPORTED + CLASSNAME QtGraphicalEffectsPlugin + DEPENDENCIES + QtGraphicalEffects/private/1.0 + QtQuick.Window/2.1 SOURCES plugin.cpp PUBLIC_LIBRARIES @@ -89,6 +93,13 @@ add_qt_resource(qtgraphicaleffectsplugin "qtgraphicaleffectsshaders" ) +#### Keys ignored in scope 2:.:.:effects_plugin.pro:: +# CXX_MODULE = "qml" +# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# QML_FILES = "Blend.qml" "BrightnessContrast.qml" "ColorOverlay.qml" "Colorize.qml" "ConicalGradient.qml" "Desaturate.qml" "DirectionalBlur.qml" "Displace.qml" "DropShadow.qml" "FastBlur.qml" "GammaAdjust.qml" "GaussianBlur.qml" "Glow.qml" "HueSaturation.qml" "InnerShadow.qml" "LevelAdjust.qml" "LinearGradient.qml" "MaskedBlur.qml" "OpacityMask.qml" "RadialBlur.qml" "RadialGradient.qml" "RectangularGlow.qml" "RecursiveBlur.qml" "ThresholdMask.qml" "ZoomBlur.qml" +# TARGETPATH = "QtGraphicalEffects" +# _LOADED = "qml_plugin" + set(qml_files "Blend.qml" "BrightnessContrast.qml" @@ -116,22 +127,112 @@ set(qml_files "ThresholdMask.qml" "ZoomBlur.qml" ) +set_source_files_properties(Blend.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(BrightnessContrast.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(ColorOverlay.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(Colorize.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(ConicalGradient.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(Desaturate.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(DirectionalBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(Displace.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(DropShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(FastBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GammaAdjust.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GaussianBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(Glow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(HueSaturation.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(InnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(LevelAdjust.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(LinearGradient.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(MaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(OpacityMask.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(RadialBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(RadialGradient.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(RectangularGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(RecursiveBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(ThresholdMask.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(ZoomBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) -add_qt_resource(qtgraphicaleffectsplugin qmake_QtGraphicalEffects +qt6_target_qml_files(qtgraphicaleffectsplugin FILES ${qml_files} ) - -qt_install_qml_files(qtgraphicaleffectsplugin - FILES ${qml_files} -) - - -#### Keys ignored in scope 2:.:.:effects_plugin.pro:: -# CXX_MODULE = "qml" -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" -# _LOADED = "qml_plugin" -add_qt_docs( +add_qt_docs(qtgraphicaleffectsplugin doc/qtgraphicaleffects.qdocconf ) diff --git a/src/effects/private/.prev_CMakeLists.txt b/src/effects/private/.prev_CMakeLists.txt index 28c4733..2e35639 100644 --- a/src/effects/private/.prev_CMakeLists.txt +++ b/src/effects/private/.prev_CMakeLists.txt @@ -5,8 +5,8 @@ ##################################################################### add_qml_module(qtgraphicaleffectsprivate - CPP_PLUGIN URI "QtGraphicalEffects.private" + CLASSNAME QtGraphicalEffectsPrivatePlugin SOURCES plugin.cpp qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h @@ -23,6 +23,15 @@ add_qml_module(qtgraphicaleffectsprivate Qt::Quick ) +#### Keys ignored in scope 1:.:.:private.pro:: +# CXX_MODULE = "qml" +# QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" +# TARGETPATH = "QtGraphicalEffects/private" +# _LOADED = "qml_plugin" + +## Scopes: +##################################################################### + set(qml_files "DropShadowBase.qml" "FastGlow.qml" @@ -33,20 +42,40 @@ set(qml_files "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" ) +set_source_files_properties(DropShadowBase.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(FastGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(FastInnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(FastMaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GaussianDirectionalBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GaussianGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GaussianInnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GaussianMaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) -add_qt_resource(qtgraphicaleffectsprivate qmake_QtGraphicalEffects_private +qt6_target_qml_files(qtgraphicaleffectsprivate FILES ${qml_files} ) - -qt_install_qml_files(qtgraphicaleffectsprivate - FILES ${qml_files} -) - - -#### Keys ignored in scope 1:.:.:private.pro:: -# CXX_MODULE = "qml" -# _LOADED = "qml_plugin" - -## Scopes: -##################################################################### diff --git a/src/effects/private/CMakeLists.txt b/src/effects/private/CMakeLists.txt index 4ac3943..68cbe4a 100644 --- a/src/effects/private/CMakeLists.txt +++ b/src/effects/private/CMakeLists.txt @@ -5,8 +5,8 @@ ##################################################################### add_qml_module(qtgraphicaleffectsprivate - CPP_PLUGIN URI "QtGraphicalEffects.private" + CLASSNAME QtGraphicalEffectsPrivatePlugin VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" # special case SOURCES plugin.cpp @@ -24,6 +24,15 @@ add_qml_module(qtgraphicaleffectsprivate Qt::Quick ) +#### Keys ignored in scope 1:.:.:private.pro:: +# CXX_MODULE = "qml" +# QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" +# TARGETPATH = "QtGraphicalEffects/private" +# _LOADED = "qml_plugin" + +## Scopes: +##################################################################### + set(qml_files "DropShadowBase.qml" "FastGlow.qml" @@ -34,20 +43,40 @@ set(qml_files "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" ) +set_source_files_properties(DropShadowBase.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(FastGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(FastInnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(FastMaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GaussianDirectionalBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GaussianGlow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GaussianInnerShadow.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) +set_source_files_properties(GaussianMaskedBlur.qml PROPERTIES + QT_QML_SOURCE_VERSION "1.0" + QT_QML_SOURCE_INSTALL TRUE +) -add_qt_resource(qtgraphicaleffectsprivate qmake_QtGraphicalEffects_private +qt6_target_qml_files(qtgraphicaleffectsprivate FILES ${qml_files} ) - -qt_install_qml_files(qtgraphicaleffectsprivate - FILES ${qml_files} -) - - -#### Keys ignored in scope 1:.:.:private.pro:: -# CXX_MODULE = "qml" -# _LOADED = "qml_plugin" - -## Scopes: -##################################################################### -- cgit v1.2.1 From 249e7489416229362107a94679f4ddfcbc540b64 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 15 Oct 2019 16:05:07 +0200 Subject: Regenerate before merge Change-Id: I15eef405dd8d1323850a22daf7258fb755d36dc1 Reviewed-by: Simon Hausmann --- .prev_CMakeLists.txt | 23 +++++++++++++++++++++++ CMakeLists.txt | 17 ++++++++++++++--- src/effects/CMakeLists.txt | 25 ------------------------- src/effects/private/.prev_CMakeLists.txt | 8 -------- src/effects/private/CMakeLists.txt | 8 -------- tests/.prev_CMakeLists.txt | 10 ++++++++++ tests/CMakeLists.txt | 10 +++++----- tests/auto/CMakeLists.txt | 2 -- tests/manual/smooth/CMakeLists.txt | 13 ++++++++----- 9 files changed, 60 insertions(+), 56 deletions(-) create mode 100644 .prev_CMakeLists.txt create mode 100644 tests/.prev_CMakeLists.txt diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt new file mode 100644 index 0000000..50cd55d --- /dev/null +++ b/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from qtgraphicaleffects.pro. + +cmake_minimum_required(VERSION 3.15.0) + +project(graphicaleffects_FIXME + VERSION 6.0.0 + DESCRIPTION "Qt graphicaleffects_FIXME Libraries" + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) + +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 d5aaa34..19d18e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,22 @@ +# Generated from qtgraphicaleffects.pro. + cmake_minimum_required(VERSION 3.15.0) -project(QtGraphicalEffects +project(QtGraphicalEffects # special case VERSION 6.0.0 - DESCRIPTION "Qt Graphical Effects" + DESCRIPTION "Qt Graphical Effects" # special case HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Quick) +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Quick) # special case + +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/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt index 62f3694..ff6b72e 100644 --- a/src/effects/CMakeLists.txt +++ b/src/effects/CMakeLists.txt @@ -129,103 +129,78 @@ set(qml_files ) set_source_files_properties(Blend.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(BrightnessContrast.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(ColorOverlay.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(Colorize.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(ConicalGradient.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(Desaturate.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(DirectionalBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(Displace.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(DropShadow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(FastBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GammaAdjust.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GaussianBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(Glow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(HueSaturation.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(InnerShadow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(LevelAdjust.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(LinearGradient.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(MaskedBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(OpacityMask.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(RadialBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(RadialGradient.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(RectangularGlow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(RecursiveBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(ThresholdMask.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(ZoomBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) qt6_target_qml_files(qtgraphicaleffectsplugin diff --git a/src/effects/private/.prev_CMakeLists.txt b/src/effects/private/.prev_CMakeLists.txt index 2e35639..9c7f22a 100644 --- a/src/effects/private/.prev_CMakeLists.txt +++ b/src/effects/private/.prev_CMakeLists.txt @@ -44,35 +44,27 @@ set(qml_files ) set_source_files_properties(DropShadowBase.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(FastGlow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(FastInnerShadow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(FastMaskedBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GaussianDirectionalBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GaussianGlow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GaussianInnerShadow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GaussianMaskedBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) qt6_target_qml_files(qtgraphicaleffectsprivate diff --git a/src/effects/private/CMakeLists.txt b/src/effects/private/CMakeLists.txt index 68cbe4a..8ffcd11 100644 --- a/src/effects/private/CMakeLists.txt +++ b/src/effects/private/CMakeLists.txt @@ -45,35 +45,27 @@ set(qml_files ) set_source_files_properties(DropShadowBase.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(FastGlow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(FastInnerShadow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(FastMaskedBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GaussianDirectionalBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GaussianGlow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GaussianInnerShadow.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) set_source_files_properties(GaussianMaskedBlur.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" - QT_QML_SOURCE_INSTALL TRUE ) qt6_target_qml_files(qtgraphicaleffectsprivate diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt new file mode 100644 index 0000000..1ff062b --- /dev/null +++ b/tests/.prev_CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from tests.pro. + +if(NOT TARGET Qt::Test) + cmake_minimum_required(VERSION 3.15.0) + project(graphicaleffectsTests_FIXME VERSION 6.0.0 LANGUAGES C CXX) + find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) + find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) + qt_set_up_standalone_tests_build() +endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9cb1a65..cca08c8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,10 +1,10 @@ -# special case begin +# Generated from tests.pro. + if(NOT TARGET Qt::Test) cmake_minimum_required(VERSION 3.15.0) - project(QtGraphicalEffectsTests VERSION 6.0.0 LANGUAGES C CXX ASM) - find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Test Qml Quick) + project(QtGraphicalEffectsTests VERSION 6.0.0 LANGUAGES C CXX) # special case + find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS Core Test Qml Quick) # special case qt_set_up_standalone_tests_build() endif() -# special case end - qt_build_tests() + diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 4fec531..bbd9fc5 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qtgraphicaleffects - GUI SOURCES tst_qtgraphicaleffects.cpp PUBLIC_LIBRARIES @@ -15,5 +14,4 @@ add_qt_test(tst_qtgraphicaleffects ) #### Keys ignored in scope 1:.:.:auto.pro:: -# CONFIG = "testcase" # DISTFILES = "dummy.qml" diff --git a/tests/manual/smooth/CMakeLists.txt b/tests/manual/smooth/CMakeLists.txt index 17e88d4..094d308 100644 --- a/tests/manual/smooth/CMakeLists.txt +++ b/tests/manual/smooth/CMakeLists.txt @@ -16,19 +16,22 @@ add_qt_executable(smooth ) # Resources: +set(resources_resource_files + "CellContainer.qml" + "SourceImage.qml" + "main.qml" + "star.png" +) + add_qt_resource(smooth "resources" PREFIX "/" FILES - CellContainer.qml - SourceImage.qml - main.qml - star.png + ${resources_resource_files} ) #### Keys ignored in scope 1:.:.:smooth.pro:: -# CONFIG = "c++11" # QML_DESIGNER_IMPORT_PATH = # QML_IMPORT_PATH = -- cgit v1.2.1 From 46f75ef4912d2a677bee4b76af1de0b7f4a37f04 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 23 Oct 2019 12:59:34 +0200 Subject: Prospective cmake build fix Find the BuildInternals package in order to find qt_set_up_standalone_tests_build() Change-Id: If7396d5ad1ba873a3fc277dcd1677f185677834d Reviewed-by: Simon Hausmann --- tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cca08c8..e65ab4b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,7 +3,7 @@ if(NOT TARGET Qt::Test) cmake_minimum_required(VERSION 3.15.0) project(QtGraphicalEffectsTests VERSION 6.0.0 LANGUAGES C CXX) # special case - find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS Core Test Qml Quick) # special case + find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Test Qml Quick) # special case qt_set_up_standalone_tests_build() endif() qt_build_tests() -- cgit v1.2.1 From 936be561e4b2d28b51a1c1a9dae4b7baf1f932e1 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 14 Nov 2019 16:22:49 +0100 Subject: Regenerate projects Change-Id: I3499e0bfaefec73f16132a3da6dd2e5088dc7879 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/effects/private/.prev_CMakeLists.txt | 3 +-- src/effects/private/CMakeLists.txt | 3 +-- tests/auto/CMakeLists.txt | 2 +- tests/manual/smooth/CMakeLists.txt | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/effects/private/.prev_CMakeLists.txt b/src/effects/private/.prev_CMakeLists.txt index 9c7f22a..4037888 100644 --- a/src/effects/private/.prev_CMakeLists.txt +++ b/src/effects/private/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtgraphicaleffectsprivate Plugin: ##################################################################### -add_qml_module(qtgraphicaleffectsprivate +qt_add_qml_module(qtgraphicaleffectsprivate URI "QtGraphicalEffects.private" CLASSNAME QtGraphicalEffectsPrivatePlugin SOURCES @@ -27,7 +27,6 @@ add_qml_module(qtgraphicaleffectsprivate # CXX_MODULE = "qml" # QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" # TARGETPATH = "QtGraphicalEffects/private" -# _LOADED = "qml_plugin" ## Scopes: ##################################################################### diff --git a/src/effects/private/CMakeLists.txt b/src/effects/private/CMakeLists.txt index 8ffcd11..815c308 100644 --- a/src/effects/private/CMakeLists.txt +++ b/src/effects/private/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtgraphicaleffectsprivate Plugin: ##################################################################### -add_qml_module(qtgraphicaleffectsprivate +qt_add_qml_module(qtgraphicaleffectsprivate URI "QtGraphicalEffects.private" CLASSNAME QtGraphicalEffectsPrivatePlugin VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" # special case @@ -28,7 +28,6 @@ add_qml_module(qtgraphicaleffectsprivate # CXX_MODULE = "qml" # QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" # TARGETPATH = "QtGraphicalEffects/private" -# _LOADED = "qml_plugin" ## Scopes: ##################################################################### diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index bbd9fc5..1c2a2cb 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtgraphicaleffects Test: ##################################################################### -add_qt_test(tst_qtgraphicaleffects +qt_add_test(tst_qtgraphicaleffects SOURCES tst_qtgraphicaleffects.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/smooth/CMakeLists.txt b/tests/manual/smooth/CMakeLists.txt index 094d308..3efec4a 100644 --- a/tests/manual/smooth/CMakeLists.txt +++ b/tests/manual/smooth/CMakeLists.txt @@ -4,7 +4,7 @@ ## smooth Binary: ##################################################################### -add_qt_executable(smooth +qt_add_manual_test(smooth GUI SOURCES main.cpp @@ -23,7 +23,7 @@ set(resources_resource_files "star.png" ) -add_qt_resource(smooth "resources" +qt_add_resource(smooth "resources" PREFIX "/" FILES -- cgit v1.2.1 From 7c372c634b9433d21f0bf2653f281f83a7cb334d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 6 Mar 2020 17:25:25 +0100 Subject: Regenerate projects Change-Id: If53bcd94a338c62bf69ed7f74c6a8bc5ff4818ed Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor Reviewed-by: Liang Qi --- src/effects/CMakeLists.txt | 1 - src/effects/private/.prev_CMakeLists.txt | 11 ++++++----- src/effects/private/CMakeLists.txt | 12 ++++++------ src/effects/private/private.pro | 1 + tests/.prev_CMakeLists.txt | 9 +++------ tests/CMakeLists.txt | 8 +++----- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt index ff6b72e..14c9213 100644 --- a/src/effects/CMakeLists.txt +++ b/src/effects/CMakeLists.txt @@ -98,7 +98,6 @@ add_qt_resource(qtgraphicaleffectsplugin "qtgraphicaleffectsshaders" # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" # QML_FILES = "Blend.qml" "BrightnessContrast.qml" "ColorOverlay.qml" "Colorize.qml" "ConicalGradient.qml" "Desaturate.qml" "DirectionalBlur.qml" "Displace.qml" "DropShadow.qml" "FastBlur.qml" "GammaAdjust.qml" "GaussianBlur.qml" "Glow.qml" "HueSaturation.qml" "InnerShadow.qml" "LevelAdjust.qml" "LinearGradient.qml" "MaskedBlur.qml" "OpacityMask.qml" "RadialBlur.qml" "RadialGradient.qml" "RectangularGlow.qml" "RecursiveBlur.qml" "ThresholdMask.qml" "ZoomBlur.qml" # TARGETPATH = "QtGraphicalEffects" -# _LOADED = "qml_plugin" set(qml_files "Blend.qml" diff --git a/src/effects/private/.prev_CMakeLists.txt b/src/effects/private/.prev_CMakeLists.txt index 4037888..aba6f59 100644 --- a/src/effects/private/.prev_CMakeLists.txt +++ b/src/effects/private/.prev_CMakeLists.txt @@ -6,26 +6,27 @@ qt_add_qml_module(qtgraphicaleffectsprivate URI "QtGraphicalEffects.private" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtGraphicalEffectsPrivatePlugin SOURCES plugin.cpp qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h qgfxsourceproxy.cpp qgfxsourceproxy_p.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Quick + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:private.pro:: # CXX_MODULE = "qml" # QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtGraphicalEffects/private" ## Scopes: diff --git a/src/effects/private/CMakeLists.txt b/src/effects/private/CMakeLists.txt index 815c308..aba6f59 100644 --- a/src/effects/private/CMakeLists.txt +++ b/src/effects/private/CMakeLists.txt @@ -6,27 +6,27 @@ qt_add_qml_module(qtgraphicaleffectsprivate URI "QtGraphicalEffects.private" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtGraphicalEffectsPrivatePlugin - VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" # special case SOURCES plugin.cpp qgfxshaderbuilder.cpp qgfxshaderbuilder_p.h qgfxsourceproxy.cpp qgfxsourceproxy_p.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Quick + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:private.pro:: # CXX_MODULE = "qml" # QML_FILES = "DropShadowBase.qml" "FastGlow.qml" "FastInnerShadow.qml" "FastMaskedBlur.qml" "GaussianDirectionalBlur.qml" "GaussianGlow.qml" "GaussianInnerShadow.qml" "GaussianMaskedBlur.qml" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtGraphicalEffects/private" ## Scopes: diff --git a/src/effects/private/private.pro b/src/effects/private/private.pro index 64d63c9..ef63d6b 100644 --- a/src/effects/private/private.pro +++ b/src/effects/private/private.pro @@ -1,6 +1,7 @@ CXX_MODULE=qml TARGETPATH=QtGraphicalEffects/private TARGET = qtgraphicaleffectsprivate +QML_IMPORT_VERSION = $$QT_VERSION QT += quick qml # Needed to get a hold of QQuickShaderEffectSource, QQuickImage and QQuickItemPrivate diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt index 1ff062b..2214137 100644 --- a/tests/.prev_CMakeLists.txt +++ b/tests/.prev_CMakeLists.txt @@ -1,10 +1,7 @@ # Generated from tests.pro. -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.15.0) - project(graphicaleffectsTests_FIXME VERSION 6.0.0 LANGUAGES C CXX) - find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) - find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - qt_set_up_standalone_tests_build() +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e65ab4b..ed965c0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,10 +1,8 @@ # Generated from tests.pro. -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.15.0) - project(QtGraphicalEffectsTests VERSION 6.0.0 LANGUAGES C CXX) # special case - find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Test Qml Quick) # special case - qt_set_up_standalone_tests_build() +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() qt_build_tests() -- cgit v1.2.1