Merge Qt 6.5.4 opensource release

Change-Id: Ib62ce0ef5f39ade337b70cda10b70a052e5f84fb
qt · Jan 10, 2025 · 9ca8d6d · 9ca8d6d
1 parent f4d5592
commit 9ca8d6d
Show file tree

Hide file tree

Showing 40 changed files with 40 additions and 40 deletions.
diff --git a/qt3d b/qt3d
diff --git a/qt5compat b/qt5compat
diff --git a/qtactiveqt b/qtactiveqt
diff --git a/qtbase b/qtbase
diff --git a/qtcharts b/qtcharts
diff --git a/qtcoap b/qtcoap
diff --git a/qtconnectivity b/qtconnectivity
diff --git a/qtdatavis3d b/qtdatavis3d
diff --git a/qtdeclarative b/qtdeclarative
diff --git a/qtdoc b/qtdoc
diff --git a/qtgrpc b/qtgrpc
diff --git a/qthttpserver b/qthttpserver
diff --git a/qtimageformats b/qtimageformats
diff --git a/qtlanguageserver b/qtlanguageserver
diff --git a/qtlocation b/qtlocation
diff --git a/qtlottie b/qtlottie
diff --git a/qtmqtt b/qtmqtt
diff --git a/qtmultimedia b/qtmultimedia
diff --git a/qtnetworkauth b/qtnetworkauth
diff --git a/qtopcua b/qtopcua
diff --git a/qtpositioning b/qtpositioning
diff --git a/qtquick3d b/qtquick3d
diff --git a/qtquick3dphysics b/qtquick3dphysics
diff --git a/qtquickeffectmaker b/qtquickeffectmaker
diff --git a/qtquicktimeline b/qtquicktimeline
diff --git a/qtremoteobjects b/qtremoteobjects
diff --git a/qtscxml b/qtscxml
diff --git a/qtsensors b/qtsensors
diff --git a/qtserialbus b/qtserialbus
diff --git a/qtserialport b/qtserialport
diff --git a/qtshadertools b/qtshadertools
diff --git a/qtspeech b/qtspeech
diff --git a/qtsvg b/qtsvg
diff --git a/qttools b/qttools
diff --git a/qttranslations b/qttranslations
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
diff --git a/qtwayland b/qtwayland
diff --git a/qtwebchannel b/qtwebchannel
diff --git a/qtwebsockets b/qtwebsockets
diff --git a/qtwebview b/qtwebview
+8 −8		dependencies.yaml
+18 −3		src/3rdparty/assimp/assimp.cmake
+27 −0		src/3rdparty/assimp/config.h
+3 −1		src/3rdparty/assimp/qt_attribution.json
+2 −2		src/3rdparty/assimp/revision.h
+1 −1		src/3rdparty/assimp/src
+1 −0		src/plugins/sceneparsers/assimp/CMakeLists.txt
+52,263 −0		tests/manual/advancedcustommaterial/models/waterPlane.obj
+10,149 −0		tests/manual/exampleresources/assets/obj/ball.obj
+211,461 −0		tests/manual/exampleresources/assets/obj/material-sphere.obj
+447 −0		tests/manual/exampleresources/assets/obj/plane-10x10.obj
+13,240 −0		tests/manual/exampleresources/assets/obj/toyplane.obj
+12,006 −0		tests/manual/exampleresources/assets/obj/trefoil.obj
+1 −1		CMakeLists.txt
+4 −4		dependencies.yaml
+2 −1		examples/core5/widgets/tools/codecs/doc/src/codecs.qdoc
+2 −2		dependencies.yaml
+2 −0		src/activeqt/container/CMakeLists.txt
+12 −12		dependencies.yaml
+2 −1		doc/config/qtdoc.qdocconf
+32 −2		doc/src/cmake/cmake-manual.qdoc
+2 −1		doc/src/datainputoutput.qdoc
+1 −1		doc/src/platformintegration/qpa.qdoc
+1 −0		doc/src/platforms/android/android-openssl-support.qdoc
+28 −20		doc/src/platforms/android/android.qdoc
+90 −36		doc/src/platforms/qnx.qdoc
+1 −1		doc/src/platforms/supported-platforms.qdoc
+1 −14		doc/src/whatsnew/qt6-buildsystem.qdoc
+6 −0		doc/src/whatsnew/whatsnew65.qdoc
+1 −0		examples/demos/FX_Material_Showroom/doc/src/FX_Material_Showroom.qdoc
+1 −0		examples/demos/coffee/coffee.qdoc
+5 −5		examples/demos/colorpaletteclient/doc/src/colorpaletteclient.qdoc
+3 −2		examples/demos/mediaplayer/MediaControls/AudioControl.qml
+1 −0		examples/demos/mediaplayer/MediaControls/PlaybackControl.qml
+3 −2		examples/demos/mediaplayer/MediaControls/PlaybackRateControl.qml
+2 −1		examples/demos/samegame/doc/src/samegame.qdoc
+3 −0		examples/demos/thermostat/content/BottomBarForm.ui.qml
+1 −1		examples/demos/thermostat/content/EnergyInfoForm.ui.qml
+1 −1		examples/demos/thermostat/content/HumidityInfoForm.ui.qml
+11 −2		examples/demos/thermostat/content/RoomsSwipeView.qml
+3 −2		examples/demos/thermostat/content/SideBarForm.ui.qml
+1 −1		examples/demos/thermostat/content/ThermostatSettingsForm.ui.qml
+2 −1		examples/demos/thermostat/doc/src/thermostat.qdoc
+2 −0		cmake/FindWrapgRPCPlugin.cmake
+4 −4		dependencies.yaml
+3 −0		examples/grpc/chat/CMakeLists.txt
+2 −0		src/grpc/doc/qtgrpc.qdocconf
+2 −0		src/protobuf/doc/qtprotobuf.qdocconf
+1 −6		src/tools/qtgrpcgen/qgrpcgenerator.cpp
+2 −1		src/tools/qtgrpcgen/qgrpcgenerator.h
+8 −0		src/tools/qtprotobufgen/Qt6ProtobufToolsMacros.cmake
+3 −9		src/tools/qtprotobufgen/qprotobufgenerator.cpp
+2 −0		src/tools/qtprotobufgen/qprotobufgenerator.h
+4 −4		dependencies.yaml
+11 −10		doc/colorpalette-example.qdoc
+2 −0		doc/config/qthttpserver.qdocconf
+2 −2		dependencies.yaml
+4 −3		src/plugins/imageformats/macheif/CMakeLists.txt
+2 −2		dependencies.yaml
+0 −6		src/jsonrpc/qjsonrpcprotocol.cpp
+6 −6		dependencies.yaml
+14 −0		examples/location/mapviewer/CMakeLists.txt
+1 −0		examples/location/mapviewer/doc/src/mapviewer.qdoc
+5 −3		src/location/doc/qtlocation.qdocconf
+5 −11		src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
+1 −2		src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
+1 −1		src/plugins/geoservices/nokia/qgeoerror_messages.cpp
+6 −9		src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+1 −2		src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+5 −10		src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+15 −34		src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+2 −4		src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
+1 −1		src/plugins/geoservices/nokia/qgeouriprovider.cpp
+9 −11		src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+1 −2		src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+6 −6		src/plugins/geoservices/nokia/uri_constants.cpp
+2 −2		dependencies.yaml
+5 −0		tests/auto/oauth1/tst_oauth1.cpp