Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
[submodule "modules/qttools"]
path = modules/qttools
url = https://github.com/qt/qttools.git
branch = v6.10.1
branch = v6.10.2
2 changes: 1 addition & 1 deletion modules/qttools
Submodule qttools updated 92 files
+6 βˆ’4 .cmake.conf
+3 βˆ’3 dependencies.yaml
+1 βˆ’1 examples/designer/doc/src/calculatorbuilder.qdoc
+1 βˆ’0 examples/linguist/CMakeLists.txt
+ βˆ’ examples/linguist/doc/images/linguist-localizedclock-idbased-dialog_de.webp
+ βˆ’ examples/linguist/doc/images/linguist-localizedclock-idbased-dialog_en.webp
+ βˆ’ examples/linguist/doc/images/linguist-localizedclock-idbased_de.webp
+ βˆ’ examples/linguist/doc/images/linguist-localizedclock-idbased_en.webp
+301 βˆ’0 examples/linguist/doc/src/localizedclock-idbased.qdoc
+61 βˆ’0 examples/linguist/localizedclock-idbased/CMakeLists.txt
+77 βˆ’0 examples/linguist/localizedclock-idbased/Main.qml
+17 βˆ’0 examples/linguist/localizedclock-idbased/dialog.cpp
+26 βˆ’0 examples/linguist/localizedclock-idbased/dialog.h
+100 βˆ’0 examples/linguist/localizedclock-idbased/dialog.ui
+43 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_ar.ts
+39 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_de.ts
+40 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_en.ts
+39 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_es.ts
+39 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_fr.ts
+39 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_it.ts
+38 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_ja.ts
+38 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_ko.ts
+39 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_pt.ts
+38 βˆ’0 examples/linguist/localizedclock-idbased/i18n/clock_zh.ts
+60 βˆ’0 examples/linguist/localizedclock-idbased/main.cpp
+45 βˆ’0 examples/linguist/localizedclock-idbased/timezonemanager.cpp
+38 βˆ’0 examples/linguist/localizedclock-idbased/timezonemanager.h
+7 βˆ’0 src/assistant/assistant/remotecontrol.cpp
+1 βˆ’0 src/assistant/assistant/remotecontrol.h
+7 βˆ’0 src/designer/src/designer/CMakeLists.txt
+9 βˆ’0 src/designer/src/designer/Designer.entitlements
+5 βˆ’2 src/designer/src/designer/assistantclient.cpp
+1 βˆ’1 src/designer/src/lib/shared/rcc.cpp
+1 βˆ’1 src/kmap2qmap/CMakeLists.txt
+1 βˆ’1 src/linguist/linguist/doc/qtlinguist.qdocconf
+3 βˆ’0 src/linguist/lprodump/CMakeLists.txt
+19 βˆ’44 src/linguist/lupdate/cpp.cpp
+8 βˆ’1 src/qdoc/qdoc/doc/qdoc-manual-contextcmds.qdoc
+29 βˆ’2 src/qdoc/qdoc/doc/qdoc-manual-qdocconf.qdoc
+61 βˆ’1 src/qdoc/qdoc/doc/qdoc-warnings.qdoc
+158 βˆ’5 src/qdoc/qdoc/src/qdoc/classnode.cpp
+15 βˆ’0 src/qdoc/qdoc/src/qdoc/classnode.h
+12 βˆ’3 src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp
+66 βˆ’20 src/qdoc/qdoc/src/qdoc/generator.cpp
+1 βˆ’1 src/qdoc/qdoc/src/qdoc/generator.h
+27 βˆ’0 src/qdoc/qdoc/src/qdoc/helpprojectwriter.cpp
+4 βˆ’1 src/qdoc/qdoc/src/qdoc/htmlgenerator.cpp
+26 βˆ’0 src/qdoc/qdoc/src/qdoc/parameters.cpp
+1 βˆ’0 src/qdoc/qdoc/src/qdoc/parameters.h
+2 βˆ’1 src/qdoc/qdoc/src/qdoc/qmlvisitor.cpp
+9 βˆ’4 src/qdoc/qdoc/src/qdoc/sections.cpp
+1 βˆ’1 src/qdoc/qdoc/src/qdoc/tree.cpp
+2 βˆ’2 src/qdoc/qdoc/tests/generatedoutput/testdata/configs/testcpp.qdocconf
+2 βˆ’0 src/qdoc/qdoc/tests/generatedoutput/testdata/crossmodule/crossmodule.qdocconf
+2 βˆ’2 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf
+1 βˆ’1 ...s/validateqdocoutputfiles/testdata/comprehensiveproject_headerdocs/comprehensiveproject_headerdocs.qdocconf
+1 βˆ’1 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject_headerdocs/src/qml/DocTest.qml
+26 βˆ’0 ...alidateqdocoutputfiles/testdata/overloaded_empty_targets/expected/docbook/overloadedemptytargets-module.xml
+96 βˆ’0 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_empty_targets/expected/docbook/testclass.xml
+34 βˆ’0 .../validateqdocoutputfiles/testdata/overloaded_empty_targets/expected/html/overloadedemptytargets-module.html
+24 βˆ’0 .../tests/validateqdocoutputfiles/testdata/overloaded_empty_targets/expected/html/overloadedemptytargets.index
+23 βˆ’0 ...c/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_empty_targets/expected/html/testclass-members.html
+121 βˆ’0 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_empty_targets/expected/html/testclass.html
+4 βˆ’0 ...sts/validateqdocoutputfiles/testdata/overloaded_empty_targets/expected/overloadedemptytargets-module.webxml
+24 βˆ’0 .../qdoc/tests/validateqdocoutputfiles/testdata/overloaded_empty_targets/expected/overloadedemptytargets.index
+41 βˆ’0 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_empty_targets/expected/testclass.webxml
+24 βˆ’0 ...qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_empty_targets/overloaded_empty_targets.qdocconf
+45 βˆ’0 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_empty_targets/src/testclass.cpp
+26 βˆ’0 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_empty_targets/src/testclass.h
+1 βˆ’1 ...alidateqdocoutputfiles/testdata/overloaded_signals_slots/expected/docbook/overloadedsignalsslots-module.xml
+62 βˆ’22 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_signals_slots/expected/docbook/testclass.xml
+10 βˆ’14 .../tests/validateqdocoutputfiles/testdata/overloaded_signals_slots/expected/html/overloadedsignalsslots.index
+5 βˆ’7 ...c/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_signals_slots/expected/html/testclass-members.html
+74 βˆ’34 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_signals_slots/expected/html/testclass.html
+10 βˆ’14 ...ests/validateqdocoutputfiles/testdata/overloaded_signals_slots/expected/webxml/overloadedsignalsslots.index
+14 βˆ’24 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_signals_slots/expected/webxml/testclass.webxml
+8 βˆ’4 ...qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_signals_slots/overloaded_signals_slots.qdocconf
+9 βˆ’24 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_signals_slots/src/testclass.cpp
+10 βˆ’11 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/overloaded_signals_slots/src/testclass.h
+1 βˆ’1 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/docbook/scoped-enum-linking.xml
+1 βˆ’1 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/scoped-enum-linking.html
+2 βˆ’1 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/webxml/scoped-enum-linking.webxml
+3 βˆ’0 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/scopedenum.qdocconf
+2 βˆ’2 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/scopedenum.qdoc
+3 βˆ’0 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/testtemplate/testtemplate.qdocconf
+56 βˆ’0 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/expected/html/outputfromqdocfiles.qhp
+13 βˆ’0 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/tocnavigation/tocnavigation.qdocconf
+0 βˆ’2 src/qtdiag/qtdiag.cpp
+0 βˆ’0 tests/auto/linguist/lupdate/testdata/good/parsecpp_expression/expectedoutput.txt
+176 βˆ’0 tests/auto/linguist/lupdate/testdata/good/parsecpp_expression/main.cpp
+2 βˆ’0 tests/auto/linguist/lupdate/testdata/good/parsecpp_expression/project.pro
+527 βˆ’0 tests/auto/linguist/lupdate/testdata/good/parsecpp_expression/project.ts.result