diff options
| author | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-01-29 17:30:35 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-01-30 15:17:29 +0200 |
| commit | 5e40b0da297d20e89fade0ec006cbc4cb961fe97 (patch) | |
| tree | f119483e275af1b52f53e6af6d26f376f7289fd5 /basicsuite/qt5-everywhere | |
| parent | 25a4745f5e187ed9e11e9a3a76be6bc0d8bafa1e (diff) | |
[qt5-everywhere] Fix shader path
Change-Id: I5705acafc25f5cd7df258dc543d86007d023cc22
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'basicsuite/qt5-everywhere')
| -rw-r--r-- | basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
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 <QtCore/QFile> #include <QtCore/QTextStream> +#include <QtCore/QDir> +#include <QtCore/QDebug> 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() |