From 1e5523b5ce9a842fffa488cfae107cf05adbbf9e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 12 Dec 2013 14:46:24 +0200 Subject: [PATCH] windeplopyqt: Run qmlimportscanner from current directory. Otherwise, passing relative paths to the -qmldir option does not work. Change-Id: I4cff5a0e1ef7a2bcfa82558bb1898361f77f3014 Reviewed-by: Joerg Bornemann --- src/windeployqt/qmlutils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windeployqt/qmlutils.cpp b/src/windeployqt/qmlutils.cpp index c2593cd..bd207fb 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) -- 2.7.4