summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@theqtcompany.com>2014-12-03 15:12:36 +0100
committerChristian Stromme <christian.stromme@theqtcompany.com>2014-12-09 14:49:23 +0100
commit33eb6cdf9313f0ad969b4af8fc7160859c2a6319 (patch)
tree8a3db6eb00a50e02399d5ab7ad059263616d6264
parentb81d09d9416bd4f3153ce24fc291617832eac8b2 (diff)
downloadqttools-33eb6cdf9313f0ad969b4af8fc7160859c2a6319.tar.gz
Android: Don't bail out if qmlimportscanner is missing.
If the qmlimportscanner is missing, just print the warning and continue, as it's most likely that the application is a non-qml application. Change-Id: Ice8b4f11df3df558555fbd3ac373561ce6fb4896 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
-rw-r--r--src/androiddeployqt/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 41acfd75e..d42775d1b 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -1650,7 +1650,7 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
if (!QFile::exists(qmlImportScanner)) {
fprintf(stderr, "qmlimportscanner not found: %s\n", qPrintable(qmlImportScanner));
- return false;
+ return true;
}
QString rootPath = options->rootPath;