summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dependencies.yaml20
-rw-r--r--doc/src/frameworks-technologies/threads.qdoc6
-rw-r--r--doc/src/getting-started/installation.qdoc1
-rw-r--r--doc/src/internationalization/i18n.qdoc5
-rw-r--r--doc/src/legal/licensechanges.qdoc32
-rw-r--r--doc/src/platforms/supported-platforms.qdoc4
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc34
-rw-r--r--doc/src/platforms/windows.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew67.qdoc2
-rw-r--r--examples/demos/calqlatr/CMakeLists.txt5
-rw-r--r--examples/demos/coffee/images/Cups/dark_cup.svgzbin20585 -> 20534 bytes
11 files changed, 74 insertions, 37 deletions
diff --git a/dependencies.yaml b/dependencies.yaml
index 194188996..a8dce0f9c 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,31 +1,31 @@
dependencies:
../qtdeclarative:
- ref: c283d4473edd1532cf1bce91ad1215e42e4fa15b
+ ref: 3f3787a6b4f54f2603598e49eeebb58532aa2afa
required: true
../qtgraphs:
- ref: 4603c618e4736b5acb5f8f6ec5bcc6606af7c95b
+ ref: e61ae9f34bc2c34d9ab1a0918ded7705f3940da7
required: false
../qthttpserver:
- ref: d238ca69ef9481d4d77897e33787bfe25663e037
+ ref: 0c89f374118384e3503ea62c926e950072fb90e2
required: false
../qtlocation:
- ref: 3c49ff3ce7bb8ee18749553c3b001b9fc6747ee2
+ ref: 7b08720f6a249d0dae46787608c37c33a07fdf4b
required: false
../qtmultimedia:
- ref: 71a9a3ad059556ebf8fad6f00e37c314fd2babb2
+ ref: 3159dc9b5586ad08dc8c06b78257abeb319c71f9
required: false
../qtpositioning:
- ref: 2750f3ecc47813c0c0de1e04d4d64f839801809b
+ ref: e8456c7dd25e15d129ebcad7e56fbe4e77bef004
required: false
../qtshadertools:
- ref: 1a3994894af3852ddde7ff0d78a7fbdf035a1a7e
+ ref: ea1d918c13a9681737e7506e9ae4951228100ba8
required: false
../qttools:
- ref: 94d1021cc54e61dcc24159f45ab47bb5fbfb1276
+ ref: 18ca583362025df1d62b1f4c7e48237b9a9c019a
required: true
../qtwebengine:
- ref: 1eee86a1850407e76897fbeb565af1346db71ce3
+ ref: 45dd5da005ef6df6912179554808b7636a6a801b
required: false
../qtwebsockets:
- ref: 37d149020c4fd7faa3a55ec013763b89d63a6853
+ ref: 343fdbb5cd7846da29d01cc3f42d4a539a7b4c89
required: false
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index ddaccc270..55ebdd3b5 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -729,9 +729,9 @@
\section1 Threads and the SQL Module
- A connection can only be used from within the thread that created it.
- Moving connections between threads or creating queries from a different
- thread is not supported.
+ A database connection must only be used from within the thread that
+ created it. Moving a connection into another thread can be done
+ with QSqlDatabase::moveToThread().
In addition, the third party libraries used by the QSqlDrivers can impose
further restrictions on using the SQL Module in a multithreaded program.
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index b64d9b774..bc494f143 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -78,6 +78,7 @@ visit the following page:
\li \l {Qt WebEngine Platform Notes} {Building Qt WebEngine from Source}
\li \l [QtQuick3D] {Building From Source}
{Building Qt Quick 3D from Source}
+ \li \l {Building Qt Multimedia from sources}{Building Qt Multimedia from Source}
\endlist
\section1 Additional Information
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 701990f52..11e5f57a2 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -448,11 +448,12 @@
\section2 QML Example
- The following QML code snippet replaces \c %n with the value of \c total:
+ The following QML code snippet translates the source text into the correct
+ plural form and replaces \c %n with the value of \c total:
\code
Text {
- text: qsTr("%n message(s) saved").arg(total)
+ text: qsTr("%n message(s) saved", "", total)
}
\endcode
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index 2f2894a77..3c09cf561 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -11,6 +11,38 @@
Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
released with Qt that are relevant to licensing.
+ \section1 Qt 6.7.1
+
+ \section2 Qt GUI Module
+
+ \list
+ \li \l{harfbuzz-ng}{HarfBuzz-NG} was updated to version 8.4.0.
+ \endlist
+
+ \section2 Qt Image Formats
+
+ \list
+ \li \l{libwebp}{WebP (libwebp)} was updated to version 1.4.0.
+ \endlist
+
+ \section2 Qt Quick3D module
+
+ \list
+ \li \l{assimp}{Open Asset Import Library} was updated to version 5.4.0.
+ \endlist
+
+ \section2 Qt Spatial Audio Module
+
+ \list
+ \li \l{pfft}{pfft} was updated to version fbc4058602803f40dc554b8a5d2bcc694c005f2f.
+ \endlist
+
+ \section2 Qt SQL Module
+
+ \list
+ \li \l{sqlite}{SQLite} was updated to version 3.45.3.
+ \endlist
+
\section1 Qt 6.7.0
\section2 Qt Doc Module
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index f8e604052..8b12c00a9 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -156,7 +156,7 @@
\li Ended
\li Yes
\row
- \li 5.15 (5.15.16) LTS
+ \li 5.15 (5.15.17) LTS
\li 2020-05-26
\li 2023-05-26 (Qt Legacy licenses) / 2025-05-26 (Qt Subscription license holders only)
\li Yes
@@ -196,7 +196,7 @@
\li 2024-10-10
\li Yes
\row
- \li 6.7 (6.7.0)
+ \li 6.7 (6.7.1)
\li 2024-03-26
\li 2025-03-26
\li Yes
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 823e811b0..641ce16a0 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -142,14 +142,14 @@ combinations.
\table
\header \li{4,1} Tier 1: Reference Targets
\header \li Vendor \li Board \li OS / Other \li Provided By
- \row \li Intel \li NUC \li Yocto 4.3 \li \l{Boot to Qt}
- \row \li NVIDIA \li Jetson AGX Xavier Development Kit \li Yocto 4.3 \li \l{Boot to Qt}
- \row \li NXP \li i.MX 8QuadMax MEK \li Yocto 4.3 \li \l{Boot to Qt}
+ \row \li Intel \li NUC \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li NVIDIA \li Jetson AGX Xavier Developer Kit \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li NXP \li i.MX 8QuadMax MEK \li Yocto 5.0 \li \l{Boot to Qt}
\row \li NXP \li i.MX 8QuadMax MEK \li QNX 7.1 \li \l{Qt for QNX}
- \row \li NXP \li i.MX 93 11x11 LPDDR4X EVK \li Yocto 4.3 \li \l{Boot to Qt}
+ \row \li NXP \li i.MX 93 11x11 LPDDR4X EVK \li Yocto 5.0 \li \l{Boot to Qt}
\row \li Qualcomm \li SA8155P \li AAOS 10-12 \li \l{Qt for Android Automotive}
\row \li Qualcomm \li SA8155P \li INTEGRITY 19.03 \li \l{Qt for INTEGRITY}
- \row \li Raspberry Pi \li Raspberry Pi 4 64-bit \li Yocto 4.3 \li \l{Boot to Qt}
+ \row \li Raspberry Pi \li Raspberry Pi 5 \li Yocto 5.0 \li \l{Boot to Qt}
\row \li Toradex \li Apalis iMX6 \li Yocto 4.0 \li \l{Boot to Qt}
\endtable
@@ -165,14 +165,15 @@ combinations.
\table
\header \li{4,1} Tier 2: Verified Targets
\header \li Vendor \li Board \li OS / Other \li Provided By
- \row \li NVIDIA \li Jetson AGX Orin Development Kit \li Debian 12 \li \l{Enterprise Qt Debian Packages}
- \row \li NXP \li i.MX 8MQuad EVK \li Yocto 4.3 \li \l{Boot to Qt}
- \row \li NXP \li i.MX 8M Mini LPDDR4 EVK \li Yocto 4.3 \li \l{Boot to Qt}
- \row \li NXP \li i.MX 8M Nano LPDDR4 EVK \li Yocto 4.3 \li \l{Boot to Qt}
- \row \li NXP \li i.MX 8M Plus LPDDR4 EVK \li Yocto 4.3 \li \l{Boot to Qt}
+ \row \li NVIDIA \li Jetson AGX Orin Developer Kit \li Debian 12 \li \l{Enterprise Qt Debian Packages}
+ \row \li NXP \li i.MX 8MQuad EVK \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li NXP \li i.MX 8M Mini LPDDR4 EVK \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li NXP \li i.MX 8M Nano LPDDR4 EVK \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li NXP \li i.MX 8M Plus LPDDR4 EVK \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li Raspberry Pi \li Raspberry Pi 4 64-bit \li Yocto 5.0 \li \l{Boot to Qt}
\row \li ST \li STM32MP15 Discovery \li Yocto 4.0 \li \l{Boot to Qt}
\row \li ST \li STM32MP15 Evaluation \li Yocto 4.0 \li \l{Boot to Qt}
- \row \li TI \li SK-AM62 \li Yocto 4.3 \li \l{Boot to Qt}
+ \row \li TI \li SK-AM62 \li Yocto 5.0 \li \l{Boot to Qt}
\row \li Toradex \li Colibri iMX6 ULL \li Yocto 4.0 \li \l{Boot to Qt}
\endtable
@@ -188,11 +189,12 @@ combinations.
\table
\header \li{4,1} Tier 3: Other Targets
\header \li Vendor \li Board \li OS / Other \li Provided By
- \row \li Amazon \li AWS EC2 ARM64 \li Yocto 4.3 \li \l{Boot to Qt}
- \row \li NVIDIA \li Jetson AGX Orin Development Kit \li Yocto 4.3 \li \l{Boot to Qt}
- \row \li NXP \li i.MX 8QuadXPlus MEK \li Yocto 4.3 \li \l{Boot to Qt}
- \row \li Qualcomm \li Robotics RB5 Development Kit \li Yocto 4.3 \li \l{Boot to Qt}
- \row \li TI \li SK-AM69 \li Yocto 4.3 \li \l{Boot to Qt}
+ \row \li Amazon \li AWS EC2 ARM64 \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li NVIDIA \li Jetson AGX Orin Developer Kit \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li NVIDIA \li Jetson Orin Nano Developer Kit \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li NXP \li i.MX 8QuadXPlus MEK \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li Qualcomm \li Robotics RB5 Development Kit \li Yocto 5.0 \li \l{Boot to Qt}
+ \row \li TI \li SK-AM69 \li Yocto 5.0 \li \l{Boot to Qt}
\row \li Toradex \li Apalis iMX8 \li Yocto 4.0 \li \l{Boot to Qt}
\endtable
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index cc15612b9..6c3282cda 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -996,7 +996,7 @@
environment variable as follows:
\badcode
- set PATH=C:\Qt\Qt-6.5.3\bin;%PATH%
+ set PATH=C:\Qt\Qt-major.minor.patch\bin;%PATH%
\endcode
If you plan to use Qt from an IDE, you need to register the Qt version explicitly
diff --git a/doc/src/whatsnew/whatsnew67.qdoc b/doc/src/whatsnew/whatsnew67.qdoc
index a00db4ddc..93449893e 100644
--- a/doc/src/whatsnew/whatsnew67.qdoc
+++ b/doc/src/whatsnew/whatsnew67.qdoc
@@ -315,6 +315,8 @@
\li QCheckBox got a new signal checkStateChanged that emits the
new check state as a type safe Qt::CheckState enum value.
\li QDateTimeEdit got a new \l{QDateTimeEdit::}{timeZone} property
+ \li On Systems running Windows 11 and above the new Windows 11 widget
+ style is used by default. This style supports Windows dark mode.
\endlist
\section2 Qt SVG Module
diff --git a/examples/demos/calqlatr/CMakeLists.txt b/examples/demos/calqlatr/CMakeLists.txt
index 512131643..9df94e7a3 100644
--- a/examples/demos/calqlatr/CMakeLists.txt
+++ b/examples/demos/calqlatr/CMakeLists.txt
@@ -4,8 +4,6 @@
cmake_minimum_required(VERSION 3.16)
project(calqlatr LANGUAGES CXX)
-set(CMAKE_AUTOMOC ON)
-
if(NOT DEFINED INSTALL_EXAMPLESDIR)
set(INSTALL_EXAMPLESDIR "examples")
endif()
@@ -14,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/calqlatr")
find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick QuickControls2)
+qt_standard_project_setup(REQUIRES 6.5)
+
qt_add_executable(calqlatrexample WIN32 MACOSX_BUNDLE
main.cpp
)
@@ -26,7 +26,6 @@ target_link_libraries(calqlatrexample PRIVATE
Qt6::QuickControls2
)
-qt6_policy(SET QTP0001 NEW)
qt_add_qml_module(calqlatrexample
URI demos.calqlatr
VERSION 1.0
diff --git a/examples/demos/coffee/images/Cups/dark_cup.svgz b/examples/demos/coffee/images/Cups/dark_cup.svgz
index 5845876f3..946930082 100644
--- a/examples/demos/coffee/images/Cups/dark_cup.svgz
+++ b/examples/demos/coffee/images/Cups/dark_cup.svgz
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 13:50:02 +0000