Merge v2.1.1 into community

Governikus · Apr 10, 2024 · 65012e4 · 65012e4
2 parents 1cabf9b + e1a76dc
commit 65012e4
Show file tree

Hide file tree

Showing 99 changed files with 1,171 additions and 478 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ if(UNIX AND NOT IOS)
 	set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0 CACHE STRING "Required macOS version")
 endif()
 
-project(AusweisApp VERSION 2.1.0 LANGUAGES ${LANGUAGES})
+project(AusweisApp VERSION 2.1.1 LANGUAGES ${LANGUAGES})
 
 # Set TWEAK if not defined in PROJECT_VERSION above to
 # have a valid tweak version without propagating it

diff --git a/Dockerfile b/Dockerfile
@@ -32,6 +32,7 @@ RUN cmake /src/ausweisapp -B /build/app \
         -DCONTAINER_SDK=ON \
         -DCMAKE_BUILD_TYPE=MinSizeRel \
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+        -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
         -GNinja && \
     cmake --build /build/app && cmake --install /build/app && \
     ccache -s -vv && rm -rf /build

diff --git a/cmake/Tools.Libraries.cmake b/cmake/Tools.Libraries.cmake
@@ -26,7 +26,7 @@ if(NOT TARGET format.qml)
 			unset(QMLFORMAT CACHE) # let's retry later
 		else()
 			file(GLOB_RECURSE FILES_QML ${PROJECT_SOURCE_DIR}/*.qml)
-			set(QMLFORMAT_CMD ${QMLFORMAT} -v -i -n -l unix -t -w 4)
+			set(QMLFORMAT_CMD ${QMLFORMAT} -v && ${QMLFORMAT} -i -n -l unix -t -w 4)
 
 			set(FORMATTING_FILE ${PROJECT_BINARY_DIR}/formatting.files.qml)
 			file(WRITE ${FORMATTING_FILE} "")

diff --git a/docs/releasenotes/2.1.1.rst b/docs/releasenotes/2.1.1.rst
@@ -0,0 +1,20 @@
+AusweisApp 2.1.1
+^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 10. April 2024
+
+
+Anwender
+""""""""
+- Visuelle Anpassungen und Optimierungen der grafischen Oberfläche.
+
+- Korrektur von selten auftretenden Problemen im Zusammenhang
+  mit dem verwendeten Browser.
+
+- Textuelle Anpassungen.
+
+
+Entwickler
+""""""""""
+- Korrektur von READER Messages im SDK bei der Verwendung von
+  unbekannten Karten oder bei instabiler Verbindung zur Karte.
diff --git a/docs/releasenotes/appcast.rst b/docs/releasenotes/appcast.rst
@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   2.1.1
    2.1.0
    announce
    issues
diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst
@@ -6,6 +6,7 @@ Versionszweig 2.1
 .. toctree::
    :maxdepth: 1
 
+   2.1.1
    2.1.0
 
 

diff --git a/libs/patches.cmake b/libs/patches.cmake
@@ -205,7 +205,7 @@ function(generate_patches)
 					set(component "${dirname}/")
 				endif()
 
-				execute_dir("${dirname}" format-patch --no-signature --no-renames --no-binary --src-prefix=x/${component} --dst-prefix=y/${component} -k ${latesttag}..HEAD -o "${patch_dir}")
+				execute_dir("${dirname}" format-patch --full-index --no-signature --no-renames --no-binary --src-prefix=x/${component} --dst-prefix=y/${component} -k ${latesttag}..HEAD -o "${patch_dir}")
 				rename_patches(${dirname})
 			else()
 				message(STATUS "Skip patches of ${dirname} and branch ${current_branch}")

diff --git a/libs/patches/openssl-0001-Remove-ios-version-min.patch b/libs/patches/openssl-0001-Remove-ios-version-min.patch
@@ -8,7 +8,7 @@ Subject: Remove ios-version-min
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git x/Configurations/15-ios.conf y/Configurations/15-ios.conf
-index 54d37f63f4..59739aeceb 100644
+index 54d37f63f445d450ae767903da4d102328b0f142..59739aecebe21780a3990f3f78e10ae92755514b 100644
 --- x/Configurations/15-ios.conf
 +++ y/Configurations/15-ios.conf
 @@ -25,7 +25,7 @@ my %targets = (

diff --git a/libs/patches/openssl-0002-android-shlib_variant.patch b/libs/patches/openssl-0002-android-shlib_variant.patch
@@ -8,7 +8,7 @@ Subject: android shlib_variant
  1 file changed, 4 insertions(+)
 
 diff --git x/Configurations/15-android.conf y/Configurations/15-android.conf
-index 41ad9223e0..f804aeb11b 100644
+index 41ad9223e0945d65ecffc82e0e5c31fd130fd0fe..f804aeb11b9687885eb74451d8b09c4f18c3ed16 100644
 --- x/Configurations/15-android.conf
 +++ y/Configurations/15-android.conf
 @@ -225,12 +225,14 @@ my %targets = (

diff --git a/libs/patches/qtbase-0001-Revert-Fix-usage-of-logging-category-on-Android.patch b/libs/patches/qtbase-0001-Revert-Fix-usage-of-logging-category-on-Android.patch
@@ -11,7 +11,7 @@ Change-Id: If19a9d615e01d61c79955cda4789ba1646520ee1
  1 file changed, 1 insertion(+), 8 deletions(-)
 
 diff --git x/qtbase/src/corelib/global/qlogging.cpp y/qtbase/src/corelib/global/qlogging.cpp
-index 7e708c9c41..96c3bc5dc6 100644
+index 7e708c9c41285b8d899e3f8c0380a7218771c538..96c3bc5dc617af2bae08773da60d975e1b34050a 100644
 --- x/qtbase/src/corelib/global/qlogging.cpp
 +++ y/qtbase/src/corelib/global/qlogging.cpp
 @@ -1593,10 +1593,7 @@ QString qFormatLogMessage(QtMsgType type, const QMessageLogContext &context, con

diff --git a/libs/patches/qtbase-0002-Fix-warning-in-q20algorithm.h-when-xcodebuild-is-use.patch b/libs/patches/qtbase-0002-Fix-warning-in-q20algorithm.h-when-xcodebuild-is-use.patch
@@ -14,7 +14,7 @@ Change-Id: If5ccbfffd0b6a53f73f221b45033dab7e4775d89
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git x/qtbase/src/corelib/global/q20algorithm.h y/qtbase/src/corelib/global/q20algorithm.h
-index f670a5dbee..24d801b2cd 100644
+index f670a5dbeee81420659a20b68b448a7422d939ec..24d801b2cdfd993def8c60a2bf60e738c921d2ea 100644
 --- x/qtbase/src/corelib/global/q20algorithm.h
 +++ y/qtbase/src/corelib/global/q20algorithm.h
 @@ -147,7 +147,7 @@ using std::ranges::none_of;

diff --git a/libs/patches/qtbase-0003-Revert-iOS-Don-t-invalidate-a11y-whenever-UI-element.patch b/libs/patches/qtbase-0003-Revert-iOS-Don-t-invalidate-a11y-whenever-UI-element.patch
@@ -12,7 +12,7 @@ This reverts commit 6eefbf74149164eac316cea59a00b45f70976ad2.
  3 files changed, 5 insertions(+), 14 deletions(-)
 
 diff --git x/qtbase/src/plugins/platforms/ios/qiosplatformaccessibility.mm y/qtbase/src/plugins/platforms/ios/qiosplatformaccessibility.mm
-index f22782fb04..d54b7db57a 100644
+index f22782fb043cd6dfe6d2e364d6d4b7b2897d0c29..d54b7db57a35acbe68121a215ba96c602d29ac04 100644
 --- x/qtbase/src/plugins/platforms/ios/qiosplatformaccessibility.mm
 +++ y/qtbase/src/plugins/platforms/ios/qiosplatformaccessibility.mm
 @@ -25,6 +25,8 @@ void invalidateCache(QAccessibleInterface *iface)
@@ -53,7 +53,7 @@ index f22782fb04..d54b7db57a 100644
      default:
          break;
 diff --git x/qtbase/src/plugins/platforms/ios/qioswindow.mm y/qtbase/src/plugins/platforms/ios/qioswindow.mm
-index 8de094533b..99f9e38846 100644
+index 8de094533bfc97c4af0c79f71207056ca278f5fb..99f9e3884668555afd4a41db6c39828d1ef56194 100644
 --- x/qtbase/src/plugins/platforms/ios/qioswindow.mm
 +++ y/qtbase/src/plugins/platforms/ios/qioswindow.mm
 @@ -75,7 +75,6 @@ QIOSWindow::~QIOSWindow()
@@ -65,7 +65,7 @@ index 8de094533b..99f9e38846 100644
      [m_view removeFromSuperview];
      [m_view release];
 diff --git x/qtbase/src/plugins/platforms/ios/quiview_accessibility.mm y/qtbase/src/plugins/platforms/ios/quiview_accessibility.mm
-index 04e1f8cfb3..366141ef81 100644
+index 04e1f8cfb3098b9135703bc5e24e025288643111..366141ef8195728d900beaeb4fc9d2229476aab8 100644
 --- x/qtbase/src/plugins/platforms/ios/quiview_accessibility.mm
 +++ y/qtbase/src/plugins/platforms/ios/quiview_accessibility.mm
 @@ -54,6 +54,7 @@

diff --git a/libs/patches/qtbase-0004-Fix-living-QLibProxyWrapper-after-shutdown-of-QCoreA.patch b/libs/patches/qtbase-0004-Fix-living-QLibProxyWrapper-after-shutdown-of-QCoreA.patch
@@ -11,7 +11,7 @@ Change-Id: I8f5e2947b6529a0a8871d040050205934ee60354
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git x/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp y/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp
-index 46066b86f7..6de7a7fb76 100644
+index 46066b86f72ab7d8ffb4e7dd0d51e257a244d9f5..6de7a7fb763f777bcd479fef74cb3fe613e3d74b 100644
 --- x/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp
 +++ y/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp
 @@ -72,7 +72,7 @@ private:

diff --git a/libs/patches/qtbase-0005-Do-not-override-OPENSSL_API_COMPAT.patch b/libs/patches/qtbase-0005-Do-not-override-OPENSSL_API_COMPAT.patch
@@ -11,7 +11,7 @@ Change-Id: Ied55e3d6ebd90fbbecb8c4d8d1638b1de3ba6969
  1 file changed, 2 deletions(-)
 
 diff --git x/qtbase/src/plugins/tls/openssl/CMakeLists.txt y/qtbase/src/plugins/tls/openssl/CMakeLists.txt
-index 0e0a7a1552..e176bbf9d5 100644
+index 0e0a7a1552dc6ef7e1b5847d5685e8b653806364..e176bbf9d5471ffc977d3a6344998f5c3274de5a 100644
 --- x/qtbase/src/plugins/tls/openssl/CMakeLists.txt
 +++ y/qtbase/src/plugins/tls/openssl/CMakeLists.txt
 @@ -20,8 +20,6 @@ qt_internal_add_plugin(QTlsBackendOpenSSLPlugin

diff --git a/libs/patches/qtbase-0006-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch b/libs/patches/qtbase-0006-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch
@@ -20,7 +20,7 @@ Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
  1 file changed, 4 insertions(+)
 
 diff --git x/qtbase/src/gui/platform/unix/qxkbcommon.cpp y/qtbase/src/gui/platform/unix/qxkbcommon.cpp
-index fc014b38e2..0de9e98fc7 100644
+index fc014b38e2cf3ed646b60f74d474e96fa76f6358..0de9e98fc7f6745fb733c57ddcc1225d4ff2d019 100644
 --- x/qtbase/src/gui/platform/unix/qxkbcommon.cpp
 +++ y/qtbase/src/gui/platform/unix/qxkbcommon.cpp
 @@ -239,10 +239,14 @@ static constexpr const auto KeyTbl = qMakeArray(

diff --git a/libs/patches/qtbase-0007-Use-SSL_CTX_set_dh_auto-if-DHparam-is-empty.patch b/libs/patches/qtbase-0007-Use-SSL_CTX_set_dh_auto-if-DHparam-is-empty.patch
@@ -22,7 +22,7 @@ Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
  4 files changed, 17 insertions(+), 7 deletions(-)
 
 diff --git x/qtbase/src/network/ssl/qsslconfiguration.cpp y/qtbase/src/network/ssl/qsslconfiguration.cpp
-index 04a9db8521..c8be1ca202 100644
+index 04a9db85216eb2361108bd01dd71f3d5e7855e04..c8be1ca202962789ad088ef528b82883144e7140 100644
 --- x/qtbase/src/network/ssl/qsslconfiguration.cpp
 +++ y/qtbase/src/network/ssl/qsslconfiguration.cpp
 @@ -942,6 +942,9 @@ QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const
@@ -36,7 +36,7 @@ index 04a9db8521..c8be1ca202 100644
      Please check the documentation of the \e{exact Qt version} that you
      are using in order to know what defaults that version uses.
 diff --git x/qtbase/src/plugins/tls/openssl/qsslcontext_openssl.cpp y/qtbase/src/plugins/tls/openssl/qsslcontext_openssl.cpp
-index ef0e63911a..75c192bd01 100644
+index ef0e63911a7e5fd6a1358231d1bc5d053a587c15..75c192bd01d2730938e82ab4be86262dca44b7c9 100644
 --- x/qtbase/src/plugins/tls/openssl/qsslcontext_openssl.cpp
 +++ y/qtbase/src/plugins/tls/openssl/qsslcontext_openssl.cpp
 @@ -697,7 +697,9 @@ QT_WARNING_POP
@@ -51,7 +51,7 @@ index ef0e63911a..75c192bd01 100644
          const QByteArray &params = dhparams.d->derData;
          const char *ptr = params.constData();
 diff --git x/qtbase/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h y/qtbase/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h
-index 1f0d739210..1531564226 100644
+index 1f0d7392101b0a954561772d4ddf1a2979f9506c..1531564226da4c07dc3f41c909dc6f705407032b 100644
 --- x/qtbase/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h
 +++ y/qtbase/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h
 @@ -516,6 +516,7 @@ DH *q_PEM_read_bio_DHparams(BIO *a, DH **b, pem_password_cb *c, void *d);
@@ -63,7 +63,7 @@ index 1f0d739210..1531564226 100644
  #ifndef OPENSSL_NO_EC
  // EC Diffie-Hellman support
 diff --git x/qtbase/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp y/qtbase/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
-index cfcff44a4d..2f3ad0547a 100644
+index cfcff44a4d9ad3f6aca4f22e368a13ed2cd917a8..2f3ad0547a4186aec2163a0361a91c075462a161 100644
 --- x/qtbase/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
 +++ y/qtbase/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
 @@ -3501,9 +3501,10 @@ void tst_QSslSocket::dhServerCustomParamsNull()

diff --git a/libs/patches/qtbase-0008-HPack-fix-a-Yoda-Condition.patch b/libs/patches/qtbase-0008-HPack-fix-a-Yoda-Condition.patch
@@ -25,7 +25,7 @@ Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git x/qtbase/src/network/access/http2/hpacktable.cpp y/qtbase/src/network/access/http2/hpacktable.cpp
-index 74a09a207f..c8c5d098c8 100644
+index 74a09a207ffb5531093bf46841c0885f5bef70e4..c8c5d098c80ad15c24d1eaca022bd7846f590048 100644
 --- x/qtbase/src/network/access/http2/hpacktable.cpp
 +++ y/qtbase/src/network/access/http2/hpacktable.cpp
 @@ -27,7 +27,7 @@ HeaderSize entry_size(QByteArrayView name, QByteArrayView value)

diff --git a/libs/patches/qtbase-0009-HPack-fix-incorrect-integer-overflow-check.patch b/libs/patches/qtbase-0009-HPack-fix-incorrect-integer-overflow-check.patch
@@ -31,7 +31,7 @@ Reviewed-by: Marc Mutz <marc.mutz@qt.io>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git x/qtbase/src/network/access/http2/hpacktable.cpp y/qtbase/src/network/access/http2/hpacktable.cpp
-index c8c5d098c8..2c728b37e3 100644
+index c8c5d098c80ad15c24d1eaca022bd7846f590048..2c728b37e3b5735d118d288f8b0594f717691557 100644
 --- x/qtbase/src/network/access/http2/hpacktable.cpp
 +++ y/qtbase/src/network/access/http2/hpacktable.cpp
 @@ -26,7 +26,9 @@ HeaderSize entry_size(QByteArrayView name, QByteArrayView value)

diff --git a/libs/patches/qtbase-0010-Fix-compilation-with-MSVC-17.8.patch b/libs/patches/qtbase-0010-Fix-compilation-with-MSVC-17.8.patch
@@ -25,7 +25,7 @@ Reviewed-by: Marc Mutz <marc.mutz@qt.io>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git x/qtbase/src/corelib/global/qcompilerdetection.h y/qtbase/src/corelib/global/qcompilerdetection.h
-index 70fa7f6c9f..58a3689341 100644
+index 70fa7f6c9f7427ff3046a6495b5fc4da6dd6bfa3..58a368934126fa78735b76bc7c5e1d252fcfdc7b 100644
 --- x/qtbase/src/corelib/global/qcompilerdetection.h
 +++ y/qtbase/src/corelib/global/qcompilerdetection.h
 @@ -77,8 +77,10 @@

diff --git a/libs/patches/qtconnectivity-0001-Reset-status-of-isSessionScheduled-when-starting-a-i.patch b/libs/patches/qtconnectivity-0001-Reset-status-of-isSessionScheduled-when-starting-a-i.patch
@@ -17,7 +17,7 @@ Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
  1 file changed, 1 insertion(+)
 
 diff --git x/qtconnectivity/src/nfc/qnearfieldmanager_ios.mm y/qtconnectivity/src/nfc/qnearfieldmanager_ios.mm
-index 2709e2c7..259c3c17 100644
+index 2709e2c710466171e7e28456cbd700c347d01982..259c3c1787355ddd6d209864605907c1c66ca7f2 100644
 --- x/qtconnectivity/src/nfc/qnearfieldmanager_ios.mm
 +++ y/qtconnectivity/src/nfc/qnearfieldmanager_ios.mm
 @@ -143,6 +143,7 @@ bool QNearFieldManagerPrivateImpl::scheduleSession(QNearFieldTarget::AccessMetho

diff --git a/libs/patches/qtconnectivity-0002-Silence-expected-java-exceptions.patch b/libs/patches/qtconnectivity-0002-Silence-expected-java-exceptions.patch
@@ -19,7 +19,7 @@ Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git x/qtconnectivity/src/nfc/qnearfieldtarget_android.cpp y/qtconnectivity/src/nfc/qnearfieldtarget_android.cpp
-index 63e7d62b..c7f842ae 100644
+index 63e7d62b9f0980762464083cf915765abd8f18e7..c7f842ae781bd0e24865a1bf011af2accd8dd739 100644
 --- x/qtconnectivity/src/nfc/qnearfieldtarget_android.cpp
 +++ y/qtconnectivity/src/nfc/qnearfieldtarget_android.cpp
 @@ -304,14 +304,14 @@ void QNearFieldTargetPrivateImpl::checkIsTargetLost()

diff --git a/libs/patches/qtdeclarative-0001-QtQml-Re-add-pthread_attr_init-to-stackPropertiesGen.patch b/libs/patches/qtdeclarative-0001-QtQml-Re-add-pthread_attr_init-to-stackPropertiesGen.patch
@@ -18,7 +18,7 @@ Change-Id: Ic851ba2ffcf13d268b3a53d926cb92f7bed7a3d9
  1 file changed, 1 insertion(+)
 
 diff --git x/qtdeclarative/src/qml/memory/qv4stacklimits.cpp y/qtdeclarative/src/qml/memory/qv4stacklimits.cpp
-index 68ef7a366a..429520e527 100644
+index 68ef7a366a173fa3df21b85af897912c69b9d654..429520e5273fc4c35ddd02710b68336b944b4742 100644
 --- x/qtdeclarative/src/qml/memory/qv4stacklimits.cpp
 +++ y/qtdeclarative/src/qml/memory/qv4stacklimits.cpp
 @@ -235,6 +235,7 @@ StackProperties stackPropertiesGeneric(qsizetype stackSize = 0)

diff --git a/libs/patches/qtdeclarative-0002-QQuickItem-fix-binding-loops-for-x-y-width-and-heigh.patch b/libs/patches/qtdeclarative-0002-QQuickItem-fix-binding-loops-for-x-y-width-and-heigh.patch
@@ -22,7 +22,7 @@ Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
  1 file changed, 20 insertions(+), 12 deletions(-)
 
 diff --git x/qtdeclarative/src/quick/items/qquickitem.cpp y/qtdeclarative/src/quick/items/qquickitem.cpp
-index a2e8c989d1..30bbf505da 100644
+index a2e8c989d1b893f357069b352f5f422da6c17768..30bbf505da10b8d9d4a22f3b7b424c3da7e25d94 100644
 --- x/qtdeclarative/src/quick/items/qquickitem.cpp
 +++ y/qtdeclarative/src/quick/items/qquickitem.cpp
 @@ -7068,15 +7068,17 @@ void QQuickItem::setX(qreal v)

diff --git a/libs/patches/qtdeclarative-0003-QQuickItem-more-fixes-for-bindable-properties.patch b/libs/patches/qtdeclarative-0003-QQuickItem-more-fixes-for-bindable-properties.patch
@@ -26,7 +26,7 @@ Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
  1 file changed, 15 insertions(+), 11 deletions(-)
 
 diff --git x/qtdeclarative/src/quick/items/qquickitem.cpp y/qtdeclarative/src/quick/items/qquickitem.cpp
-index 30bbf505da..7cc03936fc 100644
+index 30bbf505da10b8d9d4a22f3b7b424c3da7e25d94..7cc03936fc3ac442a6517f0bbd5748d33e314f06 100644
 --- x/qtdeclarative/src/quick/items/qquickitem.cpp
 +++ y/qtdeclarative/src/quick/items/qquickitem.cpp
 @@ -7111,11 +7111,12 @@ void QQuickItem::setY(qreal v)

diff --git a/libs/patches/qtdeclarative-0004-Fix-binding-loop-issue-in-quick-layout.patch b/libs/patches/qtdeclarative-0004-Fix-binding-loop-issue-in-quick-layout.patch
@@ -19,7 +19,7 @@ Change-Id: I1e318335ce8b5268d878b48a02a089d703bb90ad
  3 files changed, 11 insertions(+), 9 deletions(-)
 
 diff --git x/qtdeclarative/src/quicklayouts/qquicklayout.cpp y/qtdeclarative/src/quicklayouts/qquicklayout.cpp
-index fc2bcc130c..2e54949f1d 100644
+index fc2bcc130c20d7c2b868a921e6161facb1a1e12b..2e54949f1d9017b850d74799f399b4c1711af126 100644
 --- x/qtdeclarative/src/quicklayouts/qquicklayout.cpp
 +++ y/qtdeclarative/src/quicklayouts/qquicklayout.cpp
 @@ -742,14 +742,15 @@ void QQuickLayoutPrivate::applySizeHints() const
@@ -54,7 +54,7 @@ index fc2bcc130c..2e54949f1d 100644
      if (options & Recursive) {
          for (int i = 0; i < itemCount(); ++i) {
 diff --git x/qtdeclarative/src/quicklayouts/qquicklayout_p.h y/qtdeclarative/src/quicklayouts/qquicklayout_p.h
-index df9c4cad97..d0ccc4f185 100644
+index df9c4cad97473fa009b228832ab20d3007e9f3de..d0ccc4f185a2d157b5a8c705fb2837680e4a20f1 100644
 --- x/qtdeclarative/src/quicklayouts/qquicklayout_p.h
 +++ y/qtdeclarative/src/quicklayouts/qquicklayout_p.h
 @@ -49,7 +49,8 @@ public:
@@ -68,7 +68,7 @@ index df9c4cad97..d0ccc4f185 100644
 
      Q_DECLARE_FLAGS(EnsureLayoutItemsUpdatedOptions, EnsureLayoutItemsUpdatedOption)
 diff --git x/qtdeclarative/src/quicklayouts/qquicklinearlayout.cpp y/qtdeclarative/src/quicklayouts/qquicklinearlayout.cpp
-index b34815e449..cbd15b4878 100644
+index b34815e4496eb8eceda16e6219c03c0e0bf10000..cbd15b48786c4d6cd9d412ff59e73cd69aa6e292 100644
 --- x/qtdeclarative/src/quicklayouts/qquicklinearlayout.cpp
 +++ y/qtdeclarative/src/quicklayouts/qquicklinearlayout.cpp
 @@ -459,7 +459,7 @@ void QQuickGridLayoutBase::rearrange(const QSizeF &size)

diff --git a/libs/patches/qtscxml-0001-Build-statemachine-only.patch b/libs/patches/qtscxml-0001-Build-statemachine-only.patch
@@ -9,7 +9,7 @@ Subject: Build statemachine only
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git x/qtscxml/src/CMakeLists.txt y/qtscxml/src/CMakeLists.txt
-index 5fbfbd9d..2f94949d 100644
+index 5fbfbd9d495ba5a926b3a44380a04a60bc06d5ee..2f94949dd4410973d577062533a449ef65a091a6 100644
 --- x/qtscxml/src/CMakeLists.txt
 +++ y/qtscxml/src/CMakeLists.txt
 @@ -2,10 +2,10 @@
@@ -28,7 +28,7 @@ index 5fbfbd9d..2f94949d 100644
 -add_subdirectory(plugins)
 +#add_subdirectory(plugins)
 diff --git x/qtscxml/tools/CMakeLists.txt y/qtscxml/tools/CMakeLists.txt
-index c5831a40..234fa606 100644
+index c5831a40460daefec3845fa34a2757b0232511fd..234fa6065eb30588d7015b5e90bc498d79981951 100644
 --- x/qtscxml/tools/CMakeLists.txt
 +++ y/qtscxml/tools/CMakeLists.txt
 @@ -3,5 +3,5 @@

diff --git a/libs/patches/qttools-0001-Disable-linguist-but-keep-translation-tools.patch b/libs/patches/qttools-0001-Disable-linguist-but-keep-translation-tools.patch
@@ -9,7 +9,7 @@ Change-Id: I1c54eb0e7bb86ec0861b54b5abe753c86bb57dd9
  1 file changed, 3 deletions(-)
 
 diff --git x/qttools/src/linguist/CMakeLists.txt y/qttools/src/linguist/CMakeLists.txt
-index d85254b32..dfcfe7271 100644
+index d85254b32ea501178fd6e948cf11e28bcdfef121..dfcfe727128412dd2291f010fc161e9b15bf1728 100644
 --- x/qttools/src/linguist/CMakeLists.txt
 +++ y/qttools/src/linguist/CMakeLists.txt
 @@ -14,9 +14,6 @@ add_subdirectory(lrelease)

diff --git a/libs/patches/qttools-0002-Disable-designer-and-uitools.patch b/libs/patches/qttools-0002-Disable-designer-and-uitools.patch
@@ -9,7 +9,7 @@ See https://bugreports.qt.io/browse/QTBUG-95236
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git x/qttools/src/CMakeLists.txt y/qttools/src/CMakeLists.txt
-index 014e4c874..1574b1b20 100644
+index 014e4c874c506ebfa78ce4c4664be39c7266e693..1574b1b20e1973a4ce8650345073743ba551f3fd 100644
 --- x/qttools/src/CMakeLists.txt
 +++ y/qttools/src/CMakeLists.txt
 @@ -18,8 +18,8 @@ qt_exclude_tool_directories_from_default_target(

diff --git a/presets/ci.json b/presets/ci.json
@@ -8,6 +8,10 @@
       "binaryDir": "${sourceParentDir}/build",
       "cacheVariables": {
         "CMAKE_CXX_COMPILER_LAUNCHER": "ccache"
+      },
+      "errors": {
+        "dev": true,
+        "deprecated": true
       }
     },
     {

diff --git a/resources/jenkins/dsl/Builds/Build_Android.groovy b/resources/jenkins/dsl/Builds/Build_Android.groovy
@@ -44,10 +44,10 @@ j.with
 				}
 			}
 			qualityGates {
-				qualityGate {
+				warningsQualityGate {
 					threshold(1)
 					type('TOTAL')
-					unstable(false)
+					criticality('UNSTABLE')
 				}
 			}
 		}
@@ -88,10 +88,10 @@ j.with
 				}
 			}
 			qualityGates {
-				qualityGate {
+				warningsQualityGate {
 					threshold(1)
 					type('TOTAL')
-					unstable(false)
+					criticality('UNSTABLE')
 				}
 			}
 		}

diff --git a/resources/jenkins/dsl/Builds/Build_FreeBSD.groovy b/resources/jenkins/dsl/Builds/Build_FreeBSD.groovy
@@ -21,7 +21,7 @@ j.with
 
 	steps
 	{
-		shell('cd source; cmake -Werror=dev --preset ci-bsd')
+		shell('cd source; cmake --preset ci-bsd')
 
 		shell('''\
 			export LD_LIBRARY_PATH=$WORKSPACE/libs/dist/lib:$LD_LIBRARY_PATH

diff --git a/resources/jenkins/dsl/Builds/Build_SonarQube.groovy b/resources/jenkins/dsl/Builds/Build_SonarQube.groovy
@@ -46,7 +46,7 @@ j.with
 			$WORKSPACE/sonarqubetools/sonar-scanner/bin/sonar-scanner
 			-Dsonar.scanner.metadataFilePath=${WORKSPACE}/tmp/sonar-metadata.txt
 			-Dsonar.branch.name=${MERCURIAL_REVISION_BRANCH}
-			-Dsonar.login=${SONARQUBE_TOKEN}
+			-Dsonar.token=${SONARQUBE_TOKEN}
 			-Dsonar.qualitygate.wait=true
 			-Dsonar.qualitygate.timeout=90
 			'''))