summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-12-12 14:46:24 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-12 14:24:29 +0100
commit1e5523b5ce9a842fffa488cfae107cf05adbbf9e (patch)
tree561283c19c5e57203bfa5bf785ba2108aed8341c
parentf31505c3ea464d2e200504a6280b3ba982b6e724 (diff)
downloadqttools-1e5523b5ce9a842fffa488cfae107cf05adbbf9e.tar.gz
qttools-1e5523b5ce9a842fffa488cfae107cf05adbbf9e.tar.bz2
qttools-1e5523b5ce9a842fffa488cfae107cf05adbbf9e.zip
windeplopyqt: Run qmlimportscanner from current directory.
Otherwise, passing relative paths to the -qmldir option does not work. Change-Id: I4cff5a0e1ef7a2bcfa82558bb1898361f77f3014 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/windeployqt/qmlutils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/windeployqt/qmlutils.cpp b/src/windeployqt/qmlutils.cpp
index c2593cd3..bd207fbf 100644
--- a/src/windeployqt/qmlutils.cpp
+++ b/src/windeployqt/qmlutils.cpp
@@ -97,7 +97,7 @@ QmlImportScanResult runQmlImportScanner(const QString &directory, const QString
QByteArray stdOut;
QByteArray stdErr;
const QString binary = QStringLiteral("qmlimportscanner");
- if (!runProcess(binary, arguments, directory, &exitCode, &stdOut, &stdErr, errorMessage))
+ if (!runProcess(binary, arguments, QDir::currentPath(), &exitCode, &stdOut, &stdErr, errorMessage))
return result;
if (exitCode) {
*errorMessage = binary + QStringLiteral(" returned ") + QString::number(exitCode)