diff --git a/cmake/QtInstallHelpers.cmake b/cmake/QtInstallHelpers.cmake
index 1f1fb84634c..30962b84e2c 100644
--- a/cmake/QtInstallHelpers.cmake
+++ b/cmake/QtInstallHelpers.cmake
@@ -136,13 +136,25 @@ function(qt_internal_install_versioned_link install_dir target)
         return()
     endif()
 
-    qt_path_join(install_base_file_path  "$ENV\{DESTDIR}$\{CMAKE_INSTALL_PREFIX}"
+    qt_path_join(install_base_file_path "$\{qt_full_install_prefix}"
         "${install_dir}" "$<TARGET_FILE_BASE_NAME:${target}>")
     set(original "${install_base_file_path}$<TARGET_FILE_SUFFIX:${target}>")
     set(linkname "${install_base_file_path}${PROJECT_VERSION_MAJOR}$<TARGET_FILE_SUFFIX:${target}>")
-    set(code
-        "message(STATUS \"Creating hard link ${original} -> ${linkname}\")"
-        "file(CREATE_LINK \"${original}\" \"${linkname}\" COPY_ON_ERROR)")
+    set(code "set(qt_full_install_prefix \"$\{CMAKE_INSTALL_PREFIX}\")"
+        "  if(NOT \"$ENV\{DESTDIR}\" STREQUAL \"\")"
+        )
+    if(CMAKE_HOST_WIN32)
+        list(APPEND code
+            "    if(qt_full_install_prefix MATCHES \"^[a-zA-Z]:\")"
+            "        string(SUBSTRING \"$\{qt_full_install_prefix}\" 2 -1 qt_full_install_prefix)"
+            "    endif()"
+            )
+    endif()
+    list(APPEND code
+        "    string(PREPEND qt_full_install_prefix \"$ENV\{DESTDIR}\")"
+        "  endif()"
+        "  message(STATUS \"Creating hard link ${original} -> ${linkname}\")"
+        "  file(CREATE_LINK \"${original}\" \"${linkname}\" COPY_ON_ERROR)")
 
     if(QT_GENERATOR_IS_MULTI_CONFIG)
         # Wrap the code in a configuration check,
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake
index cecf7a681f8..cab1db7f04e 100644
--- a/cmake/QtProcessConfigureArgs.cmake
+++ b/cmake/QtProcessConfigureArgs.cmake
@@ -114,6 +114,11 @@ function(qt_feature feature)
     set_property(GLOBAL PROPERTY COMMANDLINE_FEATURE_SECTION_${feature} "${arg_SECTION}")
 endfunction()
 
+function(find_package)
+    message(FATAL_ERROR "find_package must not be used directly in configure.cmake. "
+        "Use qt_find_package or guard the call with an if(NOT QT_CONFIGURE_RUNNING) block.")
+endfunction()
+
 macro(defstub name)
     function(${name})
     endfunction()
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index aa9f8a8ce48..fb71ff7b38e 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -347,9 +347,6 @@ void tst_QFont::resetFont()
 
     QCOMPARE(firstChild.font().resolveMask(), QFont::SizeResolved);
     QCOMPARE(secondChild.font().resolveMask(), QFont::SizeResolved);
-#ifdef Q_OS_ANDROID
-    QEXPECT_FAIL("", "QTBUG-69214", Continue);
-#endif
     QCOMPARE(firstChild.font().pointSize(), parent.font().pointSize());
     QCOMPARE(secondChild.font().pointSize(), parent.font().pointSize());
     QVERIFY(parent.font().resolveMask() != 0);
diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
index fe7396ae4cc..b55257533a0 100644
--- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
@@ -461,9 +461,6 @@ void tst_QStaticText::rotatedPainter()
 
     QVERIFY(imageDrawText.toImage() != m_whiteSquare);
 
-#ifdef Q_OS_ANDROID
-    QEXPECT_FAIL("", "QTBUG-69218", Continue);
-#endif
     if (!supportsTransformations())
       QEXPECT_FAIL("", "Graphics system does not support transformed text on this platform", Abort);
     QCOMPARE(imageDrawStaticText, imageDrawText);
@@ -621,9 +618,6 @@ void tst_QStaticText::transformationChanged()
 
     QVERIFY(imageDrawText.toImage() != m_whiteSquare);
 
-#ifdef Q_OS_ANDROID
-    QEXPECT_FAIL("", "QTBUG-69220", Continue);
-#endif
     if (!supportsTransformations())
       QEXPECT_FAIL("", "Graphics system does not support transformed text on this platform", Abort);
     QCOMPARE(imageDrawStaticText, imageDrawText);