From 264b9c39b97132ccbaf7d51a8128cca0dca2a64a Mon Sep 17 00:00:00 2001 From: Ariel Molina Date: Sat, 5 Dec 2015 18:59:34 -0600 Subject: 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 --- src/particles/qquickturbulence.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 #include #include +#include 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)); -- cgit v1.2.3