diff options
| author | Ariel Molina <ariel@edis.mx> | 2015-12-05 18:59:34 -0600 |
|---|---|---|
| committer | Ariel Molina R <ariel@edis.mx> | 2015-12-08 23:31:30 +0000 |
| commit | 264b9c39b97132ccbaf7d51a8128cca0dca2a64a (patch) | |
| tree | 32da4aa54f0d16c22e95860e918988dfd019ee9c | |
| parent | d1a5ef2ba2eb3888e537dec2a27a14bebec2c9b4 (diff) | |
Particle Turbulence image now reads correctly from QRC or local files
Turbulence was always reading from local files and never reading from
QRC files.
Change-Id: I93501f136a6934764422e2a914c01f359b054b2e
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| -rw-r--r-- | src/particles/qquickturbulence.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/particles/qquickturbulence.cpp b/src/particles/qquickturbulence.cpp index 5e425472a2..8d5846710a 100644 --- a/src/particles/qquickturbulence.cpp +++ b/src/particles/qquickturbulence.cpp @@ -36,6 +36,7 @@ #include <cmath> #include <cstdlib> #include <QDebug> +#include <QQmlFile> QT_BEGIN_NAMESPACE /*! @@ -126,7 +127,7 @@ void QQuickTurbulenceAffector::initializeGrid() QImage image; if (!m_noiseSource.isEmpty()) - image = QImage(m_noiseSource.toLocalFile()).scaled(QSize(m_gridSize, m_gridSize)); + image = QImage(QQmlFile::urlToLocalFileOrQrc(m_noiseSource)).scaled(QSize(m_gridSize, m_gridSize)); if (image.isNull()) image = QImage(QStringLiteral(":particleresources/noise.png")).scaled(QSize(m_gridSize, m_gridSize)); |