Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	.qmake.conf
	src/assistant/help/qhelpcollectionhandler.cpp

Change-Id: If1408a5893bc9ade9088e01c00aab695eff131aa

1 files changed, 13 insertions, 13 deletions

diff --git a/src/assistant/qhelpgenerator/main.cpp b/src/assistant/qhelpgenerator/main.cpp
index da78f2ed8..ec8079c47 100644
--- a/src/assistant/qhelpgenerator/main.cpp
+++ b/src/assistant/qhelpgenerator/main.cpp
@@ -71,7 +71,7 @@ int generateCollectionFile(const QByteArray &data, const QString &basePath, cons
     if (config.hasError()) {
         fputs(qPrintable(QHG::tr("Collection config file error: %1\n")
                          .arg(config.errorString())), stderr);
-        return -1;
+        return 1;
     }
 
     const QMap<QString, QString> &filesToGenerate = config.filesToGenerate();
@@ -80,13 +80,13 @@ int generateCollectionFile(const QByteArray &data, const QString &basePath, cons
         QHelpProjectData helpData;
         if (!helpData.readData(absoluteFilePath(basePath, it.key()))) {
             fprintf(stderr, "%s\n", qPrintable(helpData.errorMessage()));
-            return -1;
+            return 1;
         }
 
         HelpGenerator helpGenerator;
         if (!helpGenerator.generate(&helpData, absoluteFilePath(basePath, it.value()))) {
             fprintf(stderr, "%s\n", qPrintable(helpGenerator.error()));
-            return -1;
+            return 1;
         }
     }
 
@@ -97,20 +97,20 @@ int generateCollectionFile(const QByteArray &data, const QString &basePath, cons
         if (!colFi.dir().remove(colFi.fileName())) {
             fputs(qPrintable(QHG::tr("The file %1 cannot be overwritten.\n")
                              .arg(outputFile)), stderr);
-            return -1;
+            return 1;
         }
     }
 
     QHelpEngineCore helpEngine(outputFile);
     if (!helpEngine.setupData()) {
         fprintf(stderr, "%s\n", qPrintable(helpEngine.error()));
-        return -1;
+        return 1;
     }
 
     for (const QString &file : config.filesToRegister()) {
         if (!helpEngine.registerDocumentation(absoluteFilePath(basePath, file))) {
             fprintf(stderr, "%s\n", qPrintable(helpEngine.error()));
-            return -1;
+            return 1;
         }
     }
     if (!config.filesToRegister().isEmpty()) {
@@ -166,7 +166,7 @@ int generateCollectionFile(const QByteArray &data, const QString &basePath, cons
         QFile icon(absoluteFilePath(basePath, config.applicationIcon()));
         if (!icon.open(QIODevice::ReadOnly)) {
             fputs(qPrintable(QHG::tr("Cannot open %1.\n").arg(icon.fileName())), stderr);
-            return -1;
+            return 1;
         }
         CollectionConfiguration::setApplicationIcon(helpEngine, icon.readAll());
     }
@@ -184,7 +184,7 @@ int generateCollectionFile(const QByteArray &data, const QString &basePath, cons
         QFile icon(absoluteFilePath(basePath, config.aboutIcon()));
         if (!icon.open(QIODevice::ReadOnly)) {
             fputs(qPrintable(QHG::tr("Cannot open %1.\n").arg(icon.fileName())), stderr);
-            return -1;
+            return 1;
         }
         CollectionConfiguration::setAboutIcon(helpEngine, icon.readAll());
     }
@@ -206,7 +206,7 @@ int generateCollectionFile(const QByteArray &data, const QString &basePath, cons
             QFile f(fi.absoluteFilePath());
             if (!f.open(QIODevice::ReadOnly)) {
                 fputs(qPrintable(QHG::tr("Cannot open %1.\n").arg(f.fileName())), stderr);
-                return -1;
+                return 1;
             }
             QByteArray data = f.readAll();
             s << data;
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])
         return 0;
     } else if (!error.isEmpty()) {
         fprintf(stderr, "%s\n\n%s", qPrintable(error), qPrintable(help));
-        return -1;
+        return 1;
     }
 
     // detect input file type (qhp or qhcp)
@@ -359,7 +359,7 @@ int main(int argc, char *argv[])
     QFile file(inputFile);
     if (!file.open(QIODevice::ReadOnly)) {
         fputs(qPrintable(QHG::tr("Could not open %1.\n").arg(inputFile)), stderr);
-        return -1;
+        return 1;
     }
 
     const QString outputExtension = inputType == InputQhp ? QCH : QHC;
@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
         QHelpProjectData *helpData = new QHelpProjectData();
         if (!helpData->readData(inputFile)) {
             fprintf(stderr, "%s\n", qPrintable(helpData->errorMessage()));
-            return -1;
+            return 1;
         }
 
         HelpGenerator generator(silent);
@@ -398,7 +398,7 @@ int main(int argc, char *argv[])
         delete helpData;
         if (!success) {
             fprintf(stderr, "%s\n", qPrintable(generator.error()));
-            return -1;
+            return 1;
         }
     } else {
         const QByteArray data = file.readAll();