early-access version 2853

externals/vcpkg/ports/qt5-tools/Fix-regression-in-lconvert-handling-empty-translations.patch

@@ -0,0 +1,25 @@
+diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp
+index 8c3fc3f..d772855 100644
+--- a/src/linguist/shared/qm.cpp
++++ b/src/linguist/shared/qm.cpp
+@@ -552,12 +552,17 @@ bool loadQM(Translator &translator, QIODevice &dev, ConversionData &cd)
+                 goto end;
+             case Tag_Translation: {
+                 int len = read32(m);
+-                if (len & 1) {
++                m += 4;
++
++                // -1 indicates an empty string
++                // Otherwise streaming format is UTF-16 -> 2 bytes per character
++                if ((len != -1) && (len & 1)) {
+                     cd.appendError(QLatin1String("QM-Format error"));
+                     return false;
+                 }
+-                m += 4;
+-                QString str = QString((const QChar *)m, len/2);
++                QString str;
++                if (len != -1)
++                    str = QString((const QChar *)m, len / 2);
+                 if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) {
+                     for (int i = 0; i < str.length(); ++i)
+                         str[i] = QChar((str.at(i).unicode() >> 8) +

externals/vcpkg/ports/qt5-tools/icudt-debug-suffix.patch

@@ -0,0 +1,13 @@
+diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
+index 4e480bb..e15f076 100644
+--- a/src/windeployqt/main.cpp
++++ b/src/windeployqt/main.cpp
+@@ -1324,7 +1324,7 @@ static DeployResult deploy(const Options &options,
+                     const QString icuVersion = icuLibs.front().mid(index, numberExpression.matchedLength());
+                     if (optVerboseLevel > 1)
+                         std::wcout << "Adding ICU version " << icuVersion << '\n';
+-                    icuLibs.push_back(QStringLiteral("icudt") + icuVersion + QLatin1String(windowsSharedLibrarySuffix));
++                    icuLibs.push_back(QStringLiteral("icudt") + (result.isDebug && platformHasDebugSuffix(options.platform) ? QStringLiteral("d") : QString()) + icuVersion + QLatin1String(windowsSharedLibrarySuffix));
+                 }
+                 for (const QString &icuLib : qAsConst(icuLibs)) {
+                     const QString icuPath = findInPath(icuLib);

externals/vcpkg/ports/qt5-tools/portfile.cmake

@@ -0,0 +1,10 @@
+include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+
+qt_submodule_installation(PATCHES
+    icudt-debug-suffix.patch # https://bugreports.qt.io/browse/QTBUG-87677
+    Fix-regression-in-lconvert-handling-empty-translations.patch # https://codereview.qt-project.org/c/qt/qttools/+/337738
+)
+
+if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
+    file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms")
+endif()

externals/vcpkg/ports/qt5-tools/vcpkg.json

@@ -0,0 +1,18 @@
+{
+  "name": "qt5-tools",
+  "version": "5.15.4",
+  "port-version": 1,
+  "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "qt5-activeqt",
+      "platform": "windows"
+    },
+    {
+      "name": "qt5-base",
+      "default-features": false
+    },
+    "qt5-declarative"
+  ]
+}