aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-10-17 14:36:23 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-10-17 13:06:35 +0000
commit02c93f5d23197bc535d5c4dfe5fab0a76d96d1df (patch)
treed4c6fa3f9228292f2364472c2cfa07368eb0f183
parent7dec020b4f52d3b73a8e858300a83bcea267bd75 (diff)
Imagine: add support for file selectors
For example: assets/ |__ button-background.9.png |__ +custom/ |__ button-background.9.png $ QT_FILE_SELECTORS=custom ./myapp Change-Id: I26f0b82885aa1a8e62fb4e3e58c7d8b19012406e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/imagine/qquickimageselector.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/imagine/qquickimageselector.cpp b/src/imports/controls/imagine/qquickimageselector.cpp
index 3d96b7f9..2c3b0cd3 100644
--- a/src/imports/controls/imagine/qquickimageselector.cpp
+++ b/src/imports/controls/imagine/qquickimageselector.cpp
@@ -40,6 +40,7 @@
#include <QtCore/qfileinfo.h>
#include <QtCore/qcache.h>
#include <QtCore/qloggingcategory.h>
+#include <QtCore/qfileselector.h>
#include <QtQml/qqmlfile.h>
#include <QtQml/private/qqmlproperty_p.h>
#include <algorithm>
@@ -87,7 +88,7 @@ static QString findFile(const QDir &dir, const QString &baseName, const QStringL
for (const QString &ext : extensions) {
QString filePath = dir.filePath(baseName + QLatin1Char('.') + ext);
if (QFile::exists(filePath))
- return filePath;
+ return QFileSelector().select(filePath);
}
return QString();
}