summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-11-09 17:37:56 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-11-13 08:02:13 +0000
commit895b785df9aea3b1e640ff84868da4df68aa7c25 (patch)
tree1c32a7ef73c7c42653652aa4dfaee9a559d10ac4 /tools
parente8d84eb0d5259a732968ed7b6bd28f2678619b48 (diff)
qgltf: Fix not putting textures into the qrc when no copying occurs
Now that the qmake rule uses "." as the default output directory for the generated files, external assets like textures are often not copied as they are in the same place already. However, we still need to list everything in the generated .qrc file. This should fix not having textures in many cases with the simplified prf. Change-Id: I2b593adf9ac9dddf32bf1e411bd9443025727f8f Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qgltf/qgltf.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp
index 2077e439d..cb30f89e6 100644
--- a/tools/qgltf/qgltf.cpp
+++ b/tools/qgltf/qgltf.cpp
@@ -1195,10 +1195,10 @@ void Exporter::copyExternalTextures(const QString &inputFilename)
foreach (const QString &textureFilename, m_importer->externalTextures()) {
QString dst = opts.outDir + textureFilename;
QString src = QFileInfo(inputFilename).path() + QStringLiteral("/") + textureFilename;
+ m_files.insert(QFileInfo(dst).fileName());
if (QFileInfo(src).absolutePath() != QFileInfo(dst).absolutePath()) {
if (opts.showLog)
qDebug().noquote() << "Copying" << src << "to" << dst;
- m_files.insert(QFileInfo(dst).fileName());
QFile(src).copy(dst);
}
}