Update rcc version to 5.15.2

src/main.cpp

@@ -50,7 +50,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#define RCC_VERSION_STR "5.15.0"
+#define RCC_VERSION_STR "5.15.2"
 
 void dumpRecursive(const QDir &dir, QTextStream &out)
 {
@@ -142,7 +142,7 @@ int runRcc(int argc, char *argv[])
     // If you use this code as an example for a translated app, make sure to translate the strings.
     QCommandLineParser parser;
     parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
-    parser.setApplicationDescription(QLatin1String("Qt Resource Compiler and Decompiler version " RCC_VERSION_STR " (Build with Qt " QT_VERSION_STR ")"));
+    parser.setApplicationDescription(QLatin1String("Qt Resource Compiler and Decompiler (ver. " RCC_VERSION_STR ", compiled with Qt " QT_VERSION_STR ")"));
     parser.addHelpOption();
     parser.addVersionOption();
 
@@ -364,8 +364,7 @@ int runRcc(int argc, char *argv[])
         // Make sure QIODevice does not do LF->CRLF,
         // otherwise we'll end up in CRCRLF instead of
         // CRLF.
-        if (list)
-            mode &= ~QIODevice::Text;
+        mode &= ~QIODevice::Text;
 #endif // Q_OS_WIN
         // using this overload close() only flushes.
         out.open(stdout, mode);
@@ -447,11 +446,10 @@ int main(int argc, char *argv[])
 {
     // rcc uses a QHash to store files in the resource system.
     // we must force a certain hash order when testing or tst_rcc will fail, see QTBUG-25078
-    if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QT_RCC_TEST"))) {
-        qSetGlobalQHashSeed(0);
-        if (qGlobalQHashSeed() != 0)
-            qFatal("Cannot force QHash seed for testing as requested");
-    }
+    // similar requirements exist for reproducibly builds.
+    qSetGlobalQHashSeed(0);
+    if (qGlobalQHashSeed() != 0)
+        qWarning("Cannot force QHash seed");
 
     return QT_PREPEND_NAMESPACE(runRcc)(argc, argv);
 }