feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add ShaderToolsPrivate lib to effect maker plugin

Browse Source 
Task-number: QDS-10499
Change-Id: Id9807cfc50198f29a31d22b046d89ec9485367e0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Amr Essam
2023-09-21 15:24:02 +03:00
committed by Amr Elsayed
parent f47e7d9d6c
commit 502aed8cfb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/effectmakernew/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ add_qtc_plugin(EffectMakerNew
QtCreator::Core QtCreator::QmlDesigner QtCreator::Core QtCreator::QmlDesigner
DEPENDS DEPENDS
Qt::Core 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 SOURCES
effectmakerplugin.cpp effectmakerplugin.h effectmakerplugin.cpp effectmakerplugin.h
effectmakerwidget.cpp effectmakerwidget.h effectmakerwidget.cpp effectmakerwidget.h
@@ -22,6 +22,5 @@ add_qtc_plugin(EffectMakerNew
effectmakercontextobject.cpp effectmakercontextobject.h effectmakercontextobject.cpp effectmakercontextobject.h
shaderfeatures.cpp shaderfeatures.h shaderfeatures.cpp shaderfeatures.h
syntaxhighlighterdata.cpp syntaxhighlighterdata.h syntaxhighlighterdata.cpp syntaxhighlighterdata.h
BUILD_DEFAULT OFF BUILD_DEFAULT OFF
) )

3
src/plugins/effectmakernew/effectmakermodel.h
View File

@@ -9,6 +9,8 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QtShaderTools/private/qshaderbaker_p.h>
namespace EffectMaker { namespace EffectMaker {
class CompositionNode; class CompositionNode;
@@ -125,6 +127,7 @@ private:
QString m_vertexShader; QString m_vertexShader;
QStringList m_defaultRootVertexShader; QStringList m_defaultRootVertexShader;
QStringList m_defaultRootFragmentShader; QStringList m_defaultRootFragmentShader;
QShaderBaker m_baker;
// Used in exported QML, at root of the file // Used in exported QML, at root of the file
QString m_exportedRootPropertiesString; QString m_exportedRootPropertiesString;
// Used in exported QML, at ShaderEffect component of the file // Used in exported QML, at ShaderEffect component of the file