From 502aed8cfb40ce42bbe312e47bd10e3393b723e3 Mon Sep 17 00:00:00 2001 From: Amr Essam Date: Thu, 21 Sep 2023 15:24:02 +0300 Subject: [PATCH] QmlDesigner: Add ShaderToolsPrivate lib to effect maker plugin Task-number: QDS-10499 Change-Id: Id9807cfc50198f29a31d22b046d89ec9485367e0 Reviewed-by: Eike Ziller Reviewed-by: Mahmoud Badri --- src/plugins/effectmakernew/CMakeLists.txt | 3 +-- src/plugins/effectmakernew/effectmakermodel.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/effectmakernew/CMakeLists.txt b/src/plugins/effectmakernew/CMakeLists.txt index 09d70a7fea0..b8842687e5e 100644 --- a/src/plugins/effectmakernew/CMakeLists.txt +++ b/src/plugins/effectmakernew/CMakeLists.txt @@ -6,7 +6,7 @@ add_qtc_plugin(EffectMakerNew QtCreator::Core QtCreator::QmlDesigner DEPENDS Qt::Core - QtCreator::Utils Qt::CorePrivate Qt::Widgets Qt::Qml Qt::QmlPrivate Qt::Quick Qt::ShaderTools + QtCreator::Utils Qt::CorePrivate Qt::Widgets Qt::Qml Qt::QmlPrivate Qt::Quick Qt::ShaderTools Qt::ShaderToolsPrivate SOURCES effectmakerplugin.cpp effectmakerplugin.h effectmakerwidget.cpp effectmakerwidget.h @@ -22,6 +22,5 @@ add_qtc_plugin(EffectMakerNew effectmakercontextobject.cpp effectmakercontextobject.h shaderfeatures.cpp shaderfeatures.h syntaxhighlighterdata.cpp syntaxhighlighterdata.h - BUILD_DEFAULT OFF ) diff --git a/src/plugins/effectmakernew/effectmakermodel.h b/src/plugins/effectmakernew/effectmakermodel.h index 08441bfb434..0dd858d5026 100644 --- a/src/plugins/effectmakernew/effectmakermodel.h +++ b/src/plugins/effectmakernew/effectmakermodel.h @@ -9,6 +9,8 @@ #include #include +#include + namespace EffectMaker { class CompositionNode; @@ -125,6 +127,7 @@ private: QString m_vertexShader; QStringList m_defaultRootVertexShader; QStringList m_defaultRootFragmentShader; + QShaderBaker m_baker; // Used in exported QML, at root of the file QString m_exportedRootPropertiesString; // Used in exported QML, at ShaderEffect component of the file