From aa4b9b88dae3b63c6cc2dc81d34e632582ad8caa Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 14 Dec 2020 19:30:36 +0100 Subject: [PATCH] QmlPreview: Restart if a shader is modified If a shader is modified we have to restart the preview. Task-number: QDS-3179 Change-Id: I7d1fbde4a0db0ecd9ac1f2c7eb60d2e919935c73 Reviewed-by: Tim Jenssen --- src/plugins/qmlpreview/qmlpreviewplugin.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp index f71653b026a..d5b0b1379ce 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp +++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp @@ -99,8 +99,19 @@ static QByteArray defaultFileLoader(const QString &filename, bool *success) static bool defaultFileClassifier(const QString &filename) { - // We cannot dynamically load changes in qtquickcontrols2.conf - return !filename.endsWith("qtquickcontrols2.conf"); + const QStringList list = { + ".glslv", + ".glslf", + "​.vsh", + ".fsh", + "qtquickcontrols2.conf" }; + + for (const QString &suffix : list) + if (filename.endsWith(suffix)) + return false; + + // We cannot dynamically load changes in qtquickcontrols2.conf and shaders + return true; } static void defaultFpsHandler(quint16 frames[8])