bug 36803: import the current state of the qt 6.7 branch

Author: christoph-cullmann

src/qtbase/cmake/QtFrameworkHelpers.cmake

@@ -141,6 +141,7 @@ function(qt_copy_framework_headers target)
         add_custom_target(${target}_copy_fw_sync_headers
             COMMAND ${copy_fw_sync_headers_command}
             COMMAND ${copy_fw_sync_headers_marker_file_command}
+            DEPENDS ${target}_sync_headers
         )
     endif()
 

src/qtbase/src/corelib/Qt6AndroidMacros.cmake

@@ -10,7 +10,8 @@ function(_qt_internal_android_get_sdk_build_tools_revision out_var)
             LIST_DIRECTORIES true
             RELATIVE "${ANDROID_SDK_ROOT}/build-tools"
             "${ANDROID_SDK_ROOT}/build-tools/*")
-        if (NOT android_build_tools)
+        list(FILTER android_build_tools INCLUDE REGEX "[0-9]+\.[0-9]+(\.[0-9]+)?")
+        if(NOT android_build_tools)
             message(FATAL_ERROR "Could not locate Android SDK build tools under \"${ANDROID_SDK_ROOT}/build-tools\"")
         endif()
         list(SORT android_build_tools)

src/qtbase/src/corelib/compat/removed_api.cpp

@@ -700,7 +700,7 @@ QCborError QCborStreamReader::lastError()
     return std::as_const(*this).lastError();
 }
 
-#include "qdatetime.h"
+#include "qdatetime.h" // also inlined API
 
 QDateTime::QDateTime(QDate date, QTime time, const QTimeZone &timeZone)
     : QDateTime(date, time, timeZone, TransitionResolution::LegacyBehavior) {}

src/qtbase/src/corelib/kernel/qjniobject.h

@@ -799,9 +799,9 @@ class QT_TECH_PREVIEW_API JObject : public JObjectBase
     }
 
 private:
-    friend bool comparesEqual(const JObject &lhs, const JObject &rhs) noexcept
+    friend bool comparesEqual(const JObject &lhs, const JObject &rhs)
     { return lhs.m_object == rhs.m_object; }
-    Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(JObject);
+    Q_DECLARE_EQUALITY_COMPARABLE(JObject);
 };
 }
 

src/qtbase/src/corelib/mimetypes/3rdparty/qt_attribution.json

@@ -16,11 +16,11 @@
                 "The Apache Tika MimeTypes list many known MIME types and how to match files (using globs and/or 'magic' rules for the file contents)",
         "Homepage":
                 "https://github.com/apache/tika/tree/main/tika-core/src/main/resources/org/apache/tika/mime",
-        "Version": "019041117149667bc4d18fabf222a0670d407959",
+        "Version": "5ea8bbf1644a593ed22ee5c7608ba33aff949d5d",
         "DownloadLocation":
-                "https://github.com/apache/tika/blob/019041117149667bc4d18fabf222a0670d407959/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml",
+                "https://github.com/apache/tika/blob/5ea8bbf1644a593ed22ee5c7608ba33aff949d5d/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml",
         "License": "Apache License 2.0",
         "LicenseId": "Apache-2.0",
-        "Copyright": "Copyright 2011 The Apache Software Foundation"
+        "Copyright": "Copyright 2024 The Apache Software Foundation"
     }
 ]

src/qtbase/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml

@@ -4957,6 +4957,15 @@
       <match value="-----BEGIN EC PARAMETERS-----" type="string" offset="0"/>
     </magic>
   </mime-type>
+  <mime-type type="application/x-java-keystore">
+    <comment>Java Keystore</comment>
+    <tika:link>https://en.wikipedia.org/wiki/Java_KeyStore</tika:link>
+    <magic priority="50">
+      <!-- magic byte: https://en.wikipedia.org/wiki/List_of_file_signatures -->
+        <match value="\xfe\xed\xfe\xed" type="string" offset="0:4"/>
+    </magic>
+    <glob pattern="*.jks" />
+  </mime-type>
 
   <mime-type type="application/x-xfig">
     <glob pattern="*.fig"/>
@@ -5534,6 +5543,7 @@
   <mime-type type="audio/vnd.vmx.cvsd"/>
   <mime-type type="audio/vorbis-config"/>
   <mime-type type="audio/x-aac">
+    <alias type="audio/aac"/>
     <glob pattern="*.aac"/>
     <magic priority="30">
       <!-- Without ID3 tags -->

src/qtbase/src/corelib/text/qchar.cpp

@@ -1590,6 +1590,11 @@ char32_t QChar::toLower(char32_t ucs4) noexcept
 
     Returns the uppercase equivalent if the character is lowercase or titlecase;
     otherwise returns the character itself.
+
+    \note This function also returns the original character in the rare case of
+    the uppercase form of the character requiring two or more characters.
+
+    \sa QString::toUpper()
 */
 
 /*!
@@ -1598,7 +1603,12 @@ char32_t QChar::toLower(char32_t ucs4) noexcept
     by \a ucs4 if the character is lowercase or titlecase; otherwise returns
     the character itself.
 
+    \note This function also returns the original character in the rare case of
+    the uppercase form of the character requiring two or more characters.
+
     \note Before Qt 6, this function took a \c uint argument and returned \c uint.
+
+    \sa QString::toUpper()
 */
 char32_t QChar::toUpper(char32_t ucs4) noexcept
 {

src/qtbase/src/corelib/text/qlocale.cpp

@@ -3379,6 +3379,9 @@ Qt::LayoutDirection QLocale::textDirection() const
   Otherwise the conversion may be done in a platform-dependent manner,
   with QString::toUpper() as a generic fallback.
 
+  \note In some cases the uppercase form of a string may be longer than the
+  original.
+
   \sa QString::toUpper()
 */
 QString QLocale::toUpper(const QString &str) const

src/qtbase/src/corelib/text/qstring.cpp

@@ -7009,7 +7009,10 @@ QString QString::toCaseFolded_helper(QString &str)
     \snippet qstring/main.cpp 81
 
     The case conversion will always happen in the 'C' locale. For
-    locale-dependent case folding use QLocale::toUpper()
+    locale-dependent case folding use QLocale::toUpper().
+
+    \note In some cases the uppercase form of a string may be longer than the
+    original.
 
     \sa toLower(), QLocale::toLower()
 */

src/qtbase/src/corelib/text/qstringtokenizer.cpp

@@ -24,19 +24,18 @@ QT_BEGIN_NAMESPACE
     enumerations Qt::SplitBehavior and Qt::CaseSensitivity further
     control the output.
 
-    QStringTokenizer drives QStringView::tokenize(), but, at least with a
-    recent compiler, you can use it directly, too:
+    QStringTokenizer drives QStringView::tokenize(), but you can use it
+    directly, too:
 
     \code
     for (auto it : QStringTokenizer{string, separator})
         use(*it);
     \endcode
 
     \note You should never, ever, name the template arguments of a
-    QStringTokenizer explicitly.  If you can use C++17 Class Template
-    Argument Deduction (CTAD), you may write
+    QStringTokenizer explicitly. You may write
     \c{QStringTokenizer{string, separator}} (without template
-    arguments).  If you can't use C++17 CTAD, you must use the
+    arguments), or use the qTokenize() function, or the
     QStringView::split() or QLatin1StringView::split() member functions
     and store the return value only in \c{auto} variables:
 
@@ -320,10 +319,6 @@ QT_BEGIN_NAMESPACE
 
     Pass values from Qt::CaseSensitivity and Qt::SplitBehavior enumerators
     as \a flags to modify the behavior of the tokenizer.
-
-    You can use this function if your compiler doesn't, yet, support C++17 Class
-    Template Argument Deduction (CTAD). We recommend direct use of QStringTokenizer
-    with CTAD instead.
 */
 
 QT_END_NAMESPACE