From 5e40b0da297d20e89fade0ec006cbc4cb961fe97 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Wed, 29 Jan 2014 17:30:35 +0100 Subject: [qt5-everywhere] Fix shader path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5705acafc25f5cd7df258dc543d86007d023cc22 Reviewed-by: Topi Reiniö --- .../qt5-everywhere/demos/shaders/import/shaderfilereader.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'basicsuite') diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp index 36a3632..1623fb7 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp +++ b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp @@ -41,12 +41,19 @@ #include "shaderfilereader.h" #include #include +#include +#include ShaderFileReader::ShaderFileReader(QObject* parent) : QObject(parent) { if (qEnvironmentVariableIsEmpty("QT_SHADER_PATH")) - setenv("QT_SHADER_PATH", "/data/user/qt/Qt5Everywhere/demos/shaders/",1); + setenv("QT_SHADER_PATH", "/data/user/qt/qt5-everywhere/demos/shaders/",1); + // check if directory contains shader files + QByteArray shaderPath(qgetenv("QT_SHADER_PATH").append("shaders/")); + QDir shaderDir(shaderPath); + if (shaderDir.entryInfoList(QStringList() << "*.fsh").length() < 1) + qWarning() << "ShaderFileReader: can not find shader files in " << shaderPath; } ShaderFileReader::~ShaderFileReader() -- cgit v1.2.3