/tests/auto/network/socket/qtcpserver/test/

ator/qt-creator.git Git repository'/>
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2023-02-22 11:28:08 +0100
committerEike Ziller <eike.ziller@qt.io>2023-02-22 11:28:08 +0100
commitddbf8a4ffb0f3f9887cf44fa1b2f13a58c2d467c (patch)
treec6d3f1cd6f1655b84e611102e1fe1d149b1aa51c
parent5b6ef231ba94c3fe0dbe0fdbb80c12855fcd0c57 (diff)
parent27760c38c64cc2def780d849dc372f5cc28dee33 (diff)
Merge remote-tracking branch 'origin/10.0'
-rw-r--r--cmake/QtCreatorIDEBranding.cmake8
-rw-r--r--cmake/QtCreatorTranslations.cmake13
-rw-r--r--dist/changelog/changes-10.0.0.md91
-rw-r--r--doc/qtcreator/images/creator-toggle-progress-bar.pngbin18077 -> 0 bytes
-rw-r--r--doc/qtcreator/images/icons/languageclient.pngbin0 -> 283 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-call-hierarchy-view.pngbin0 -> 1773 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-clang-code-model-options.pngbin4700 -> 0 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-editortoolbar-symbols.pngbin24161 -> 0 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-editortoolbar-symbols.webpbin0 -> 10548 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-preferences-code-model.webpbin0 -> 3942 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-toggle-progress-bar.webpbin0 -> 1946 bytes
-rw-r--r--doc/qtcreator/images/qtcreator-typo-clang.pngbin19902 -> 23566 bytes
-rw-r--r--doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc7
-rw-r--r--doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc3
-rw-r--r--doc/qtcreator/src/editors/creator-code-syntax.qdoc10
-rw-r--r--doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc12
-rw-r--r--doc/qtcreator/src/editors/creator-locator.qdoc5
-rw-r--r--doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc12
-rw-r--r--doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc10
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc2
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc3
-rw-r--r--doc/qtcreator/src/user-interface/creator-projects-view.qdoc5
-rw-r--r--doc/qtcreator/src/user-interface/creator-views.qdoc15
-rw-r--r--qbs/modules/qtc/qtc.qbs8
-rw-r--r--share/qtcreator/debugger/cdbbridge.py4
-rw-r--r--share/qtcreator/debugger/dumper.py6
-rw-r--r--share/qtcreator/debugger/qttypes.py5
-rw-r--r--share/qtcreator/translations/extract-customwizards.py6
-rw-r--r--share/qtcreator/translations/extract-customwizards.xq2
-rw-r--r--share/qtcreator/translations/extract-externaltools.py6
-rw-r--r--share/qtcreator/translations/extract-externaltools.xq2
-rw-r--r--share/qtcreator/translations/extract-jsonwizards.py6
-rw-r--r--share/qtcreator/translations/extract-snippets.py6
-rw-r--r--share/qtcreator/translations/extract-snippets.xq2
-rw-r--r--share/qtcreator/translations/qtcreator_cs.ts5
-rw-r--r--share/qtcreator/translations/qtcreator_da.ts2
-rw-r--r--share/qtcreator/translations/qtcreator_de.ts40
-rw-r--r--share/qtcreator/translations/qtcreator_es.ts5
-rw-r--r--share/qtcreator/translations/qtcreator_fr.ts5
-rw-r--r--share/qtcreator/translations/qtcreator_hr.ts2
-rw-r--r--share/qtcreator/translations/qtcreator_hu.ts5
-rw-r--r--share/qtcreator/translations/qtcreator_it.ts5
-rw-r--r--share/qtcreator/translations/qtcreator_ja.ts2
-rw-r--r--share/qtcreator/translations/qtcreator_pl.ts6
-rw-r--r--share/qtcreator/translations/qtcreator_ru.ts3
-rw-r--r--share/qtcreator/translations/qtcreator_sl.ts5
-rw-r--r--share/qtcreator/translations/qtcreator_uk.ts2
-rw-r--r--share/qtcreator/translations/qtcreator_zh_CN.ts16
-rw-r--r--share/qtcreator/translations/qtcreator_zh_TW.ts5
-rw-r--r--src/libs/3rdparty/syntax-highlighting/CMakeLists.txt2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/autogenerated/ksyntaxhighlighting_version.h6
-rw-r--r--src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/ksyntaxhighlighting_export.h8
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/CMakeLists.txt32
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/generators/cmake.xml.tpl99
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/generators/cmake.yaml222
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/generators/generate-cmake-syntax.py102
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/alert.xml5
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/bash.xml421
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/cmake.xml4342
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/css.xml278
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/html.xml2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/ini.xml18
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/java.xml4
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/json.xml28
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/markdown.xml47
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/perl.xml28
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/powershell.xml42
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/python.xml37
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/ruby.xml4
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/xml.xml9
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/syntax/yacc.xml10
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/themes/atom-one-dark.theme20
-rw-r--r--src/libs/3rdparty/syntax-highlighting/data/themes/atom-one-light.theme20
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/cli/kate-syntax-highlighter.cpp8
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/indexer/CMakeLists.txt2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/indexer/katehighlightingindexer.cpp136
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/CMakeLists.txt15
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/abstracthighlighter.cpp32
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/ansihighlighter.cpp731
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/ansihighlighter.h1
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/context.cpp2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/contextswitch.cpp4
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp43
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/definition_p.h3
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/definitiondownloader.cpp4
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/definitionref_p.h13
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/format.cpp68
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/format_p.h8
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/highlightingdata.cpp5
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/htmlhighlighter.cpp3
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/keywordlist.cpp2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/repository.cpp67
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/repository.h3
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/repository_p.h2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/rule.cpp128
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/rule_p.h21
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/state.cpp2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/state_p.h4
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/textstyledata_p.h2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/theme.cpp49
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/themedata.cpp44
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/themedata_p.h9
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/wildcardmatcher_p.h34
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/quick/CMakeLists.txt6
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/quick/kquicksyntaxhighlighter.cpp4
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/quick/kquicksyntaxhighlighter.h4
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/quick/kquicksyntaxhighlightingplugin.cpp7
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/quick/qmldir2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/quick/qmldir.license2
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/quick/repositorywrapper.cpp6
-rw-r--r--src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs2
-rw-r--r--src/libs/extensionsystem/iplugin.cpp2
-rw-r--r--src/libs/extensionsystem/iplugin.h3
-rw-r--r--src/libs/extensionsystem/pluginspec_p.h2
m---------src/libs/qlitehtml0
-rw-r--r--src/libs/utils/fancymainwindow.cpp2
-rw-r--r--src/libs/utils/filepath.cpp2
-rw-r--r--src/libs/utils/fsengine/fixedlistfsengine.h2
-rw-r--r--src/libs/utils/fsengine/fsengine_impl.cpp2
-rw-r--r--src/libs/utils/link.cpp4
-rw-r--r--src/libs/utils/link.h4
-rw-r--r--src/plugins/android/CMakeLists.txt1
-rw-r--r--src/plugins/android/android.qbs2
-rw-r--r--src/plugins/android/androidplugin.cpp8
-rw-r--r--src/plugins/android/androidplugin.h2
-rw-r--r--src/plugins/android/androidsdkmanager.cpp58
-rw-r--r--src/plugins/android/androidsdkmanager.h2
-rw-r--r--src/plugins/android/androidsdkmanager_test.cpp66
-rw-r--r--src/plugins/android/androidsdkmanager_test.h27
-rw-r--r--src/plugins/android/javaeditor.cpp3
-rw-r--r--src/plugins/bineditor/bineditorplugin.cpp3
-rw-r--r--src/plugins/clangformat/llvmfilesystem.h3
-rw-r--r--src/plugins/clearcase/settingspage.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/builddirparameters.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeeditor.cpp3
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp4
-rw-r--r--src/plugins/cmakeprojectmanager/cmakesettingspage.cpp2
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp3
-rw-r--r--src/plugins/coreplugin/coreconstants.h2
-rw-r--r--src/plugins/coreplugin/editormanager/documentmodel.cpp2
-rw-r--r--src/plugins/coreplugin/find/searchresultwidget.cpp2
-rw-r--r--src/plugins/coreplugin/locator/basefilefilter.cpp27
-rw-r--r--src/plugins/coreplugin/locator/basefilefilter.h2
-rw-r--r--src/plugins/coreplugin/locator/executefilter.cpp4
-rw-r--r--src/plugins/coreplugin/locator/filesystemfilter.cpp21
-rw-r--r--src/plugins/coreplugin/locator/ilocatorfilter.h6
-rw-r--r--src/plugins/coreplugin/locator/javascriptfilter.cpp2
-rw-r--r--src/plugins/coreplugin/locator/locatorsearchutils.cpp41
-rw-r--r--src/plugins/coreplugin/locator/locatorsearchutils.h4
-rw-r--r--src/plugins/coreplugin/locator/opendocumentsfilter.cpp74
-rw-r--r--src/plugins/coreplugin/locator/opendocumentsfilter.h6
-rw-r--r--src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp15
-rw-r--r--src/plugins/coreplugin/locator/urllocatorfilter.cpp2
-rw-r--r--src/plugins/cppeditor/cppcodemodelsettingspage.cpp20
-rw-r--r--src/plugins/cppeditor/cppeditorplugin.cpp3
-rw-r--r--src/plugins/debugger/cdb/cdbengine.cpp2
-rw-r--r--src/plugins/debugger/pdb/pdbengine.cpp5
-rw-r--r--src/plugins/genericprojectmanager/genericprojectfileseditor.cpp5
-rw-r--r--src/plugins/git/gitplugin.cpp3
-rw-r--r--src/plugins/glsleditor/glsleditor.cpp5
-rw-r--r--src/plugins/glsleditor/glsleditorconstants.h2
-rw-r--r--src/plugins/haskell/haskelleditorfactory.cpp3
-rw-r--r--src/plugins/help/helpindexfilter.cpp2
-rw-r--r--src/plugins/macros/macrolocatorfilter.cpp2
-rw-r--r--src/plugins/mcusupport/mcuabstractpackage.h1
-rw-r--r--src/plugins/mcusupport/mcupackage.cpp4
-rw-r--r--src/plugins/mcusupport/mcusupportoptionspage.cpp9
-rw-r--r--src/plugins/modeleditor/modeleditor_constants.h2
-rw-r--r--src/plugins/modeleditor/modeleditorfactory.cpp4
-rw-r--r--src/plugins/nim/editor/nimeditorfactory.cpp5
-rw-r--r--src/plugins/perforce/perforceplugin.cpp2
-rw-r--r--src/plugins/perfprofiler/PerfProfilerFlameGraphView.qml24
-rw-r--r--src/plugins/projectexplorer/projectexplorer.cpp14
-rw-r--r--src/plugins/projectexplorer/projectexplorer.h1
-rw-r--r--src/plugins/projectexplorer/projectnodes.cpp2
-rw-r--r--src/plugins/projectexplorer/runcontrol.cpp83
-rw-r--r--src/plugins/projectexplorer/runcontrol.h4
-rw-r--r--src/plugins/projectexplorer/sanitizerparser.cpp7
-rw-r--r--src/plugins/projectexplorer/sanitizerparser.h2
-rw-r--r--src/plugins/python/pythonconstants.h3
-rw-r--r--src/plugins/python/pythoneditor.cpp4
-rw-r--r--src/plugins/qmakeprojectmanager/profileeditor.cpp9
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h2
-rw-r--r--src/plugins/qmldesigner/CMakeLists.txt4
-rw-r--r--src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp11
-rw-r--r--src/plugins/qmldesigner/qmldesignerplugin.cpp5
-rw-r--r--src/plugins/qmldesigner/settingspage.cpp409
-rw-r--r--src/plugins/qmldesigner/settingspage.ui607
-rw-r--r--src/plugins/qmljseditor/qmljseditor.cpp3
-rw-r--r--src/plugins/qmljstools/qmljstoolssettings.cpp2
-rw-r--r--src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml18
-rw-r--r--src/plugins/qnx/CMakeLists.txt3
-rw-r--r--src/plugins/qnx/qnx.qbs2
-rw-r--r--src/plugins/qnx/qnx_export.h12
-rw-r--r--src/plugins/qnx/qnxconfiguration.cpp25
-rw-r--r--src/plugins/qnx/qnxconstants.h2
-rw-r--r--src/plugins/qnx/qnxdevice.cpp2
-rw-r--r--src/plugins/qnx/qnxdevice.h2
-rw-r--r--src/plugins/qnx/qnxdevicetester.cpp17
-rw-r--r--src/plugins/qnx/qnxplugin.cpp37
-rw-r--r--src/plugins/qnx/qnxplugin.h23
-rw-r--r--src/plugins/qnx/qnxutils.cpp93
-rw-r--r--src/plugins/qtsupport/externaleditors.cpp6
-rw-r--r--src/plugins/qtsupport/images/icons/youtubemAhwHsGdJuI.webpbin4762 -> 0 bytes
-rw-r--r--src/plugins/qtsupport/qtcreator_tutorials.xml4
-rw-r--r--src/plugins/qtsupport/qtsupport.qrc1
-rw-r--r--src/plugins/resourceeditor/resourceeditorconstants.h2
-rw-r--r--src/plugins/resourceeditor/resourceeditorfactory.cpp3
-rw-r--r--src/plugins/scxmleditor/scxmleditorconstants.h2
-rw-r--r--src/plugins/scxmleditor/scxmleditorfactory.cpp3
-rw-r--r--src/plugins/silversearcher/silversearcherplugin.cpp14
-rw-r--r--src/plugins/silversearcher/silversearcherplugin.h11
-rw-r--r--src/plugins/squish/deletesymbolicnamedialog.cpp4
-rw-r--r--src/plugins/texteditor/plaintexteditorfactory.cpp3
-rw-r--r--src/plugins/vcsbase/vcsbasesubmiteditor.cpp16
m---------src/shared/qbs0
-rw-r--r--tests/auto/debugger/tst_dumpers.cpp52
-rw-r--r--tests/auto/utils/fileutils/tst_fileutils.cpp59
-rw-r--r--tests/system/README13
-rw-r--r--tests/system/settings/mac/QtProject/qtcreator/profiles.xml25
-rw-r--r--tests/system/settings/mac/QtProject/qtcreator/qtversion.xml10
-rw-r--r--tests/system/settings/unix/QtProject/qtcreator/profiles.xml26
-rw-r--r--tests/system/settings/unix/QtProject/qtcreator/qtversion.xml10
-rw-r--r--tests/system/settings/windows/QtProject/qtcreator/profiles.xml26
-rw-r--r--tests/system/settings/windows/QtProject/qtcreator/qtversion.xml10
-rw-r--r--tests/system/settings/windows/QtProject/qtcreator/toolchains.xml40
-rw-r--r--tests/system/shared/classes.py8
-rw-r--r--tests/system/shared/editor_utils.py6
-rw-r--r--tests/system/shared/project.py20
-rw-r--r--tests/system/shared/qtcreator.py34
-rw-r--r--tests/system/suite_CSUP/tst_CSUP01/test.py2
-rw-r--r--tests/system/suite_CSUP/tst_CSUP02/test.py2
-rw-r--r--tests/system/suite_QMLS/shared/qmls.py2
-rw-r--r--tests/system/suite_QMLS/tst_QMLS04/test.py2
-rw-r--r--tests/system/suite_SCOM/tst_SCOM04/test.py2
-rw-r--r--tests/system/suite_debugger/tst_simple_analyze/test.py6
-rw-r--r--tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.10.1.tsv10
-rw-r--r--tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt6.2.4.tsv10
-rw-r--r--tests/system/suite_debugger/tst_simple_debug/test.py4
-rw-r--r--tests/system/suite_general/tst_create_proj_wizard/test.py13
-rw-r--r--tests/system/suite_general/tst_save_before_build/test.py21
-rw-r--r--tests/system/suite_qtquick/tst_qtquick_creation/test.py2
-rw-r--r--tests/system/suite_qtquick/tst_qtquick_creation3/test.py9
-rw-r--r--tests/system/suite_qtquick/tst_qtquick_creation4/test.py6
244 files changed, 4886 insertions, 5169 deletions
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index c8aae39677f..2a2e02fd172 100644
--- a/cmake/QtCreatorIDEBranding.cmake
+++ b/cmake/QtCreatorIDEBranding.cmake
@@ -1,7 +1,7 @@
-set(IDE_VERSION "9.0.82") # The IDE version.
-set(IDE_VERSION_COMPAT "9.0.82") # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "10.0.0-beta1") # The IDE display version.
-set(IDE_COPYRIGHT_YEAR "2022") # The IDE current copyright year.
+set(IDE_VERSION "9.0.83") # The IDE version.
+set(IDE_VERSION_COMPAT "9.0.83") # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "10.0.0-beta2") # The IDE display version.
+set(IDE_COPYRIGHT_YEAR "2023") # The IDE current copyright year.
set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation.
set(IDE_DISPLAY_NAME "Qt Creator") # The IDE display name.
diff --git a/cmake/QtCreatorTranslations.cmake b/cmake/QtCreatorTranslations.cmake
index 3c35f2f9126..80286602ad3 100644
--- a/cmake/QtCreatorTranslations.cmake
+++ b/cmake/QtCreatorTranslations.cmake
@@ -91,9 +91,16 @@ function(_create_ts_custom_target name)
file(WRITE "${ts_file_list}" "${_sources_str}\n${_includes_str}\n")
add_custom_target("${_arg_TS_TARGET_PREFIX}${name}"
- COMMAND Qt::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files}
+ COMMAND Qt::lupdate -locations relative -no-ui-lines "@${ts_file_list}" -ts ${ts_files}
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
- COMMENT "Generate .ts files"
+ COMMENT "Generate .ts files, with obsolete translations and files and line numbers"
+ DEPENDS ${_sources}
+ VERBATIM)
+
+ add_custom_target("${_arg_TS_TARGET_PREFIX}${name}_no_locations"
+ COMMAND Qt::lupdate -locations none -no-ui-lines "@${ts_file_list}" -ts ${ts_files}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+ COMMENT "Generate .ts files, with obsolete translations, without files and line numbers"
DEPENDS ${_sources}
VERBATIM)
@@ -107,7 +114,7 @@ function(_create_ts_custom_target name)
get_filename_component(_bin_dir ${_lupdate_binary} DIRECTORY)
add_custom_target("${_arg_TS_TARGET_PREFIX}${name}_cleaned"
- COMMAND Qt::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files}
+ COMMAND Qt::lupdate -locations relative -no-ui-lines "@${ts_file_list}" -ts ${ts_files}
COMMAND ${_bin_dir}/lconvert -locations none -no-ui-lines -no-obsolete ${ts_files} -o ${ts_files}
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMENT "Generate .ts files, remove obsolete and vanished translations, and do not add files and line number"
diff --git a/dist/changelog/changes-10.0.0.md b/dist/changelog/changes-10.0.0.md
index 2650ffa2a3d..db90fc30e59 100644
--- a/dist/changelog/changes-10.0.0.md
+++ b/dist/changelog/changes-10.0.0.md
@@ -14,95 +14,99 @@ General
-------
* Added support for temporarily dragging progress details out of the way
- (QTCREATORBUG-28078)
+ in addition to hiding them with the button below them (QTCREATORBUG-28078)
Editing
-------
* Added `Follow Symbol` for `http(s)` string literals (QTCREATORBUG-14967)
-* Added environment expansion to file system locator filter (QTCREATORBUG-242)
+* Added environment expansion to the file system locator filter (QTCREATORBUG-242)
* Added `Temporarily hide inline annotations` for types of annotations
* Improved cursor visibility with indentation visualization (QTCREATORBUG-28645)
-* Fixed editor scrolling when pressing backspace (QTCREATORBUG-28316)
-* Fixed performance of rendering many search results (QTCREATORBUG-21056)
+* Fixed the editor so that it scrolls to cursor position when pressing backspace
+ (QTCREATORBUG-28316)
+* Fixed the performance of rendering many search results (QTCREATORBUG-21056)
### C++
* Added renaming of includes when renaming `.ui` files (QTCREATORBUG-14259)
* Added automatic refactoring of C++ code when forms in `.ui` files are renamed
(QTCREATORBUG-1179)
-* Added option for ignoring files for indexing (QTCREATORBUG-28313)
+* Added the option to ignore files for indexing (QTCREATORBUG-28313)
* Added `Tools > C++ > Find Unused Functions`, and `Find Unused C/C++ Functions`
- to the project context menu (QTCREATORBUG-6772)
+ to the `Projects` view context menu (QTCREATORBUG-6772)
* Fixed text codec when rewriting headers as part of renaming
(QTCREATORBUG-28164)
-* Fixed color of whitespace visualization in string literals
+* Fixed the color of whitespace visualization in string literals
(QTCREATORBUG-26693, QTCREATORBUG-28284)
* Fixed `Move Definition` for template functions (QTCREATORBUG-28186)
* Clangd
- * Made temporary disabling of global indexing possibly by cancelling in the
+ * Made temporary disabling of global indexing possible by canceling it in the
progress indicator
* Added support for highlighting angle brackets
* Built-in
- * Added support for spaceship operator (QTCREATORBUG-27503)
- * Fixed handling of `= default` (QTCREATORBUG-28102)
+ * Added support for the spaceship operator (QTCREATORBUG-27503)
+ * Fixed the handling of `= default` (QTCREATORBUG-28102)
* ClangFormat
* Enabled by default
- * Added project setting for `ClangFormat` (QTCREATORBUG-28188)
+ * Added the option to disable `ClangFormat` for a project in
+ `Edit > Preferences > C++ > Formatting mode` (QTCREATORBUG-28188)
### Language Server Protocol
-* Added `Restart` action to menu in editor tool bar
+* Added the `Restart` action to the menu in the editor tool bar
* Added `Call Hierarchy` (QTCREATORBUG-11660)
### QML
* Updated code model to Qt 6.5
-* Added experimental support for QML language server
-* Added color preview tooltip (QTCREATORBUG-28446)
-* Added option for applying `qmlformat` on file save (QTCREATORBUG-28192,
+* Added experimental support for the QML language server
+* Added a color preview tooltip (QTCREATORBUG-28446)
+* Added the option to apply `qmlformat` on file save (QTCREATORBUG-28192,
QTCREATORBUG-26602)
* Added `Follow Symbol` for QRC paths in string literals (QTCREATORBUG-28087)
-* Adapted wizard to new features in Qt 6.4 and Qt 6.5 (QTBUG-47996)
-* Fixed freeze when closing file (QTCREATORBUG-28206)
+* Adapted the Qt Quick Application wizard template to new features in Qt 6.4
+ and Qt 6.5 (QTBUG-47996)
+* Fixed a freeze when closing files (QTCREATORBUG-28206)
* Fixed that `QtObject` was not recognized (QTCREATORBUG-28287,
QTCREATORBUG-28375)
### Python
-* Added interpreter selector to editor toolbar (PYSIDE-2154)
+* Added an interpreter selector to the editor toolbar (PYSIDE-2154)
Projects
--------
* Added `Build > Run Generator` for exporting projects to other build systems
(QTCREATORBUG-28149)
-* Added option for browsing remote file system for remote builds and targets
-* Added support for opening remote terminal
+* Added the option to browse remote file systems for remote builds and targets
+* Added support for opening remote terminals
* Fixed that wizards did not create target directories (QTCREATORBUG-28346)
* Fixed that absolute paths could be shown when relative paths would be
preferable (QTCREATORBUG-288)
### CMake
-* Added deployment method with `cmake --install` (QTCREATORBUG-25880)
-* Added option for using `cmake-format` for CMake files
+* Added a deployment method with `cmake --install` (QTCREATORBUG-25880)
+* Added the option to use `cmake-format` for CMake files
([cmake-format Documentation](https://cmake-format.readthedocs.io/en/latest/))
-* Added option for showing advanced configure items by default
+* Added the option to show advanced configure items by default
* Moved `Autorun CMake` to global settings
-* Changed environment for running CMake to be based on build environment by
- default (QTCREATORBUG-28513)
-* Fixed that `Package manager auto setup` created dependency of project build to
- Qt Creator installation
+* Changed the environment for running CMake to be based on the build environment
+ by default (QTCREATORBUG-28513)
+* Fixed that `Package manager auto setup` created a dependency of the project
+ build to the Qt Creator installation
### Qbs
-* Added `Profile` build variant (QTCREATORBUG-27206)
+* Added the `Profile` build variant (QTCREATORBUG-27206)
* Fixed that generated files were not made known to the code model
### Python
-* Removed wizard for dynamically loaded `.ui` projects (QTCREATORBUG-25807)
+* Removed the wizard template for dynamically loaded `.ui` projects
+ (QTCREATORBUG-25807)
### Qt Quick UI Prototype
@@ -115,7 +119,7 @@ Debugging
* Added pretty printers for `variant`, `optional` and `tuple` from `libcpp`
(QTCREATORBUG-25865)
-* Fixed highlighting in disassembly view
+* Fixed highlighting in the `Disassembler` view
* Fixed skipping `std::function` details when stepping
Analyzer
@@ -128,51 +132,52 @@ Analyzer
Version Control Systems
-----------------------
-* Moved support for `Fossil` SCM into mainline repository
+* Moved support for the `Fossil` SCM into the mainline repository
* Removed settings for prompting to submit (QTCREATORBUG-22233)
* Added links to file names in diff output (QTCREATORBUG-27309)
* Fixed blame on symbolic links (QTCREATORBUG-20792)
-* Fixed saving of files before applying action on chunks (QTCREATORBUG-22506)
+* Fixed the saving of files before applying an action on chunks
+ (QTCREATORBUG-22506)
* Fixed line ending preservation when reverting chunks (QTCREATORBUG-12690)
### Git
* Improved tracking of external changes (QTCREATORBUG-21089)
-* Added editor annotation for blame information (instant blame), with setting
- (opt-out), and action to show it manually for the current line
+* Added editor annotation for blame information (instant blame) with a setting
+ (opt-out) and an action to show it manually for the current line
(QTCREATORBUG-23299)
Test Integration
----------------
* Improved `Run` and `Debug Test Under Cursor` (QTCREATORBUG-28496)
-* Improved number of files that are scanned for tests
+* Improved the number of files that are scanned for tests
* Improved output handling (QTCREATORBUG-28706)
-* Made expensive checking for tests in derived `TestCase` objects optional
+* Made the expensive checking for tests in derived `TestCase` objects optional
Platforms
---------
### macOS
-* Changed kits to prefer Xcode toolchain over the wrappers in `/bin`
+* Changed kits to prefer Xcode toolchains over the wrappers in `/bin`
### Android
-* Removed service management from manifest editor (QTCREATORBUG-28024)
+* Removed service management from the manifest editor (QTCREATORBUG-28024)
### Remote Linux
-* Fixed that opening file dialog unnecessarily queried for password for remote
- devices
+* Fixed that opening a file dialog unnecessarily asks for passwords for
+ remote devices
### Docker
-* Added support for remote code model via remote Clangd
+* Added support for the remote code model via a remote Clangd
* Added support for loading and attaching to core dumps from remote devices
* Added support for using ClangFormat on remote files
-* Added option to enable necessary capabilities for debugging with LLDB
-* Fixed issue with space in file paths (QTCREATORBUG-28476)
+* Added an option to enable necessary capabilities for debugging with LLDB
+* Fixed an issue with space in file paths (QTCREATORBUG-28476)
* Fixed that auto-detection controls were shown for devices registered by the
installer
diff --git a/doc/qtcreator/images/creator-toggle-progress-bar.png b/doc/qtcreator/images/creator-toggle-progress-bar.png
deleted file mode 100644
index 4d041e363cb..00000000000
--- a/doc/qtcreator/images/creator-toggle-progress-bar.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtcreator/images/icons/languageclient.png b/doc/qtcreator/images/icons/languageclient.png
new file mode 100644
index 00000000000..878b4df4b98
--- /dev/null
+++ b/doc/qtcreator/images/icons/languageclient.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-call-hierarchy-view.png b/doc/qtcreator/images/qtcreator-call-hierarchy-view.png
new file mode 100644
index 00000000000..95f0c87dd31
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-call-hierarchy-view.png
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-clang-code-model-options.png b/doc/qtcreator/images/qtcreator-clang-code-model-options.png
deleted file mode 100644
index 7bc9edcafdf..00000000000
--- a/doc/qtcreator/images/qtcreator-clang-code-model-options.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-editortoolbar-symbols.png b/doc/qtcreator/images/qtcreator-editortoolbar-symbols.png
deleted file mode 100644
index 8128c7ae13b..00000000000
--- a/doc/qtcreator/images/qtcreator-editortoolbar-symbols.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-editortoolbar-symbols.webp b/doc/qtcreator/images/qtcreator-editortoolbar-symbols.webp
new file mode 100644
index 00000000000..4c26207b89c
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-editortoolbar-symbols.webp
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-code-model.webp b/doc/qtcreator/images/qtcreator-preferences-code-model.webp
new file mode 100644
index 00000000000..9cd9458fe57
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-preferences-code-model.webp
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-toggle-progress-bar.webp b/doc/qtcreator/images/qtcreator-toggle-progress-bar.webp
new file mode 100644
index 00000000000..c8438ae0026
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-toggle-progress-bar.webp
Binary files differ
diff --git a/doc/qtcreator/images/qtcreator-typo-clang.png b/doc/qtcreator/images/qtcreator-typo-clang.png
index 76722d658ed..2d0b6bd5d11 100644
--- a/doc/qtcreator/images/qtcreator-typo-clang.png
+++ b/doc/qtcreator/images/qtcreator-typo-clang.png
Binary files differ
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
index ac746926e3d..1359eceda1e 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
@@ -393,6 +393,13 @@
CMake script that installs dependencies from a \c conanfile.txt,
\c conanfile.py, or \c vcpkg.json file in the project source directory.
+ \section1 QTC_RUN Environment Variable
+
+ \QC sets the environment variable \c QTC_RUN to \c 1 when executing
+ the \c cmake process.
+
+ This enables the CMake code to detect if it's being executed from \QC.
+
\section1 CMake Clean Steps
When building with CMake, you can add arguments to pass to CMake and the
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index 504eaa9087b..d775a87d58f 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -775,9 +775,6 @@
but this option should be used with care, as it is slow and unstable on the
GDB side. For more information, see \l{Specifying GDB Settings}.
- \include creator-debugger-common.qdocinc debugger-expressions-cpp
- \include creator-debugger-common.qdocinc debugger-qt-basic-objects
-
\section1 Debugging C++ Based Applications
The following sections describe additional debugging functions that apply
diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
index deb2e3b7d9f..609e2837915 100644
--- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
@@ -21,7 +21,7 @@
In the following screenshot, \QC annotates an error because a semicolon is
missing at the end of the line:
- \image qtcreator-syntaxerror.png
+ \image qtcreator-syntaxerror.png {Syntax error in the Edit mode}
In the following screenshot, \QC issues a warning because the variable is
not used:
@@ -30,10 +30,11 @@
In the following screenshot, a Qt class name has a typo:
- \image qtcreator-typo-clang.png
+ \image qtcreator-typo-clang.png {Annotation tooltip in the Edit mode}
You can use the icons in the tooltip popup to copy the error or
- warning message to the clipboard or to ignore and hide it. Select
+ warning message to the clipboard, to hide messages of a particular type,
+ or to \l{Configuring clangd}{change the diagnostics settings}. Select
the \uicontrol {Annotation Settings} link to specify the position
of the line annotations.
@@ -745,7 +746,8 @@
\uicontrol {Code Model}, this action also expands all
\c {"#include <foo.h>"} statements to their actual contents.
- \image qtcreator-clang-code-model-options.png "C++ Code Model preferences"
+ \image qtcreator-preferences-code-model.webp {C++ Code Model preferences}
+
\endif
diff --git a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
index 72d4595a081..82d3530d2bc 100644
--- a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
@@ -28,7 +28,7 @@
open in the editor.
\if defined(qtcreator)
- \image qtcreator-editortoolbar-symbols.png
+ \image qtcreator-editortoolbar-symbols.webp {Edit mode toolbar}
\else
\image studio-edit-mode.png
\endif
@@ -116,6 +116,16 @@
\uicontrol {Project Settings} > \uicontrol Editor.
\if defined(qtcreator)
For more information, see \l {Specifying Editor Settings}.
+
+ \section2 Managing Language Servers
+
+ Select the \inlineimage icons/languageclient.png
+ icon on the editor toolbar (7) to view the \l{Using Language Servers}
+ {language server} for the current project. You can restart the language
+ server or select another one in the menu. Also, you can
+ \l{Inspecting Language Clients}{inspect the communication} between \QC
+ and language servers and view server capabilities, as well as
+ \l{Specifying Settings for Language Clients}{set language server preferences}.
\endif
\section1 Editing Selected Lines
diff --git a/doc/qtcreator/src/editors/creator-locator.qdoc b/doc/qtcreator/src/editors/creator-locator.qdoc
index cefef039c4f..232b5587274 100644
--- a/doc/qtcreator/src/editors/creator-locator.qdoc
+++ b/doc/qtcreator/src/editors/creator-locator.qdoc
@@ -87,7 +87,10 @@
\li Locating any open document (\c {o})
- \li Locating files anywhere on your file system (\c {f})
+ \li Locating files anywhere on your file system (\c {f}). You can use
+ environment variables in the \c {f} filter. For example, use
+ \c {f $ENVVAR} to expand the environment variable \c ENVVAR on Unix
+ systems and \c {f %ENVVAR%} to expand it on Windows systems.
\li Locating files belonging to your project (\c {p}), such as source,
header, resource, and \c {.ui} files, or to any project (\c {a})
diff --git a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
index fc761984f2e..45ca8060925 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
@@ -104,7 +104,7 @@
\li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol C++ >
\uicontrol {Code Model}.
- \image qtcreator-clang-code-model-options.png "C++ Code Model preferences"
+ \image qtcreator-preferences-code-model.webp {C++ Code Model preferences}
\li To instruct the code model to interpret ambiguous header files as C
language files if you develop mainly using C, select the
@@ -127,6 +127,10 @@
edit the value for the \uicontrol {Do not index files greater than}
check box. To index all files, deselect the check box.
+ \li To ignore files that match wildcard patterns, select the
+ \uicontrol {Ignore files} check box and enter each wildcard pattern
+ on a separate line in the field.
+
\endlist
\section1 Configuring clangd
@@ -139,6 +143,12 @@
re-scanning is incremental, so nothing is lost by closing and re-starting
\QC.
+ To temporarily disable global indexing, select
+ \uicontrol {Toggle Progress Details} (1), and then select \uicontrol X on
+ the progress bar.
+
+ \image qtcreator-toggle-progress-bar.webp {Toggle Progress Details button}
+
By default, \QC runs one clangd process per project. If you have created
\l{Managing Sessions}{sessions} that have related projects, you can
specify that the projects in the session should be managed by a single
diff --git a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
index 358a4b33b46..99dcfb69eac 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
@@ -32,6 +32,8 @@
\l{Viewing Defined Types and Symbols}{Outline} view or
in the \uicontrol Symbols list on the \l{Using the Editor Toolbar}
{editor toolbar}
+ \li \l{Viewing Call Hierarchy}
+ {Viewing the callers and callees of a function}
\li \l{Finding Symbols}{Finding references to symbols}
\li \l{Renaming Symbols}{Renaming the symbol under cursor}
\li Code actions
@@ -120,7 +122,9 @@
name. For more information, see \l{Using Qt Creator Variables}.
\li In the \uicontrol Java field, enter the path to the Java executable.
\li In the \uicontrol {Java Language Server} field, enter the path to
- the Java language server \c .jar file.
+ the Java language server \c .jar file. You can download the Java
+ language server from \l{https://download.eclipse.org/jdtls/milestones/}
+ {Eclipse Downloads}.
\endlist
\section2 Python Language Server
@@ -182,6 +186,10 @@
determines when the server is started. The information displayed depends on
the language server.
+ Select the \inlineimage icons/languageclient.png
+ button on the \l{Managing Language Servers}{editor toolbar}, and then select
+ \uicontrol {Restart} to restart language servers.
+
\uicontrol Log displays additional information about the selected log entry.
You can see the \uicontrol {Content length} and \uicontrol {MIME type} of
a \uicontrol {Client Message} and \uicontrol {Server Message}, as well as
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
index 6563358d778..d06989e66fc 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
@@ -97,6 +97,6 @@
To show or hide detailed progress information, select
\uicontrol {Toggle Progress Details} (1).
- \image creator-toggle-progress-bar.png "Toggle Progress Details button"
+ \image qtcreator-toggle-progress-bar.webp {Toggle Progress Details button}
*/
diff --git a/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc b/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc
index 3541b706ca2..674a733357f 100644
--- a/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc
@@ -60,6 +60,9 @@
You can change the font family and size as well as text formatting, style,
alignment, and color.
+ \note Move the mouse pointer over a color hex value in the code editor to
+ see the color as a tooltip.
+
If a property is assigned an expression instead of a value, you
cannot use the toolbar to edit it. The button for editing the property
is disabled.
diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
index 85bdb4f1a51..b0a98a81635 100644
--- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc
@@ -68,7 +68,8 @@
\endif
\li Rename or remove existing files. If you change the base name of a
file, \QC displays a list of other files with the same base name
- and offers to rename them as well.
+ and offers to rename them as well. If you rename a UI file (.ui),
+ \QC also changes corresponding include statements accordingly.
\if defined(qtcreator)
\li Remove existing directories from \l{Setting Up a Generic Project}
{generic projects}.
@@ -76,7 +77,9 @@
\li Add libraries. For more information, see
\l{Adding Libraries to Projects}.
\li Add and remove subprojects.
+ \li Find unused functions.
\endif
+
\li Search from the selected directory.
\li Open a terminal window in the project directory. To specify the
terminal to use on Linux and \macos, select \uicontrol Edit >
diff --git a/doc/qtcreator/src/user-interface/creator-views.qdoc b/doc/qtcreator/src/user-interface/creator-views.qdoc
index 12faa3bb0d7..856dfd15eef 100644
--- a/doc/qtcreator/src/user-interface/creator-views.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-views.qdoc
@@ -102,6 +102,21 @@
To visit all parts of a namespace, double-click on the namespace item
multiple times.
+ \section1 Viewing Call Hierarchy
+
+ The \uicontrol {Call Hierarchy} view shows information about incoming and
+ outgoing function calls from a \l{Using Language Servers}{language server}.
+ Place the cursor on a function definition in the code editor to see lists
+ of functions that call it and the functions it calls. This works recursively,
+ so you can also see the caller of the caller. However, Clangd only lists
+ incoming calls.
+
+ Select the \inlineimage icons/languageclient.png
+ button on the \l{Managing Language Servers}{editor toolbar}, and then select
+ \uicontrol {Restart} to collect call hierarchy information for the function.
+
+ \image qtcreator-call-hierarchy-view.png {Call Hierarchy view}
+
\section1 Viewing Type Hierarchy
To view the base classes and derived classes of a class, right-click the
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 834bee02c4a..b4688986a35 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -6,20 +6,20 @@ import qbs.Utilities
Module {
Depends { name: "cpp"; required: false }
- property string qtcreator_display_version: '10.0.0-beta1'
+ property string qtcreator_display_version: '10.0.0-beta2'
property string ide_version_major: '9'
property string ide_version_minor: '0'
- property string ide_version_release: '82'
+ property string ide_version_release: '83'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.'
+ ide_version_release
property string ide_compat_version_major: '9'
property string ide_compat_version_minor: '0'
- property string ide_compat_version_release: '82'
+ property string ide_compat_version_release: '83'
property string qtcreator_compat_version: ide_compat_version_major + '.'
+ ide_compat_version_minor + '.' + ide_compat_version_release
- property string qtcreator_copyright_year: '2022'
+ property string qtcreator_copyright_year: '2023'
property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd"
property string ide_display_name: 'Qt Creator'
diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py
index bd96a8e15c5..8b0d323aa56 100644
--- a/share/qtcreator/debugger/cdbbridge.py
+++ b/share/qtcreator/debugger/cdbbridge.py
@@ -479,6 +479,10 @@ class Dumper(DumperBase):
return None
nativeValue = value.nativeValue
+ if nativeValue is None:
+ if not self.isExpanded():
+ raise Exception("Casting not expanded values is to expensive")
+ nativeValue = self.nativeParseAndEvaluate('(%s)0x%x' % (value.type.name, value.pointer()))
castVal = nativeVtCastValue(nativeValue)
if castVal is not None:
val = self.fromNativeValue(castVal)
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 1d11682ed75..f72ea04b38d 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -3309,13 +3309,13 @@ class DumperBase():
else:
val = self.dumper.nativeValueDereferenceReference(self)
elif self.type.code == TypeCode.Pointer:
- if self.nativeValue is None:
+ try:
+ val = self.dumper.nativeValueDereferencePointer(self)
+ except:
val.laddress = self.pointer()
val._type = self.type.dereference()
if self.dumper.useDynamicType:
val._type = self.dumper.nativeDynamicType(val.laddress, val.type)
- else:
- val = self.dumper.nativeValueDereferencePointer(self)
else:
raise RuntimeError("WRONG: %s" % self.type.code)
#DumperBase.warn("DEREFERENCING FROM: %s" % self)
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index e9da10b5014..031addb8530 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -2328,7 +2328,10 @@ def qdump_QWeakPointerHelper(d, value, isWeak, innerType=None):
if innerType is None:
innerType = value.type[0]
with Children(d):
- short = d.putSubItem('data', d.createValue(val, innerType))
+ dataAddress = value.laddress
+ if isWeak:
+ dataAddress = dataAddress + d.ptrSize()
+ short = d.putSubItem('data', d.createValue(dataAddress, d.createPointerType(innerType)))
d.putIntItem('weakref', weakref)
d.putIntItem('strongref', strongref)
d.putValue(short.value, short.encoding)
diff --git a/share/qtcreator/translations/extract-customwizards.py b/share/qtcreator/translations/extract-customwizards.py
index c5235b53628..7606a62606d 100644
--- a/share/qtcreator/translations/extract-customwizards.py
+++ b/share/qtcreator/translations/extract-customwizards.py
@@ -15,8 +15,8 @@ target_file = sys.argv[2]
def fix_value(value):
- value = value.replace('\"', '\\\"')
- value = value.replace('\n', '\\\n')
+ value = value.replace('\"', '\\"')
+ value = value.replace('\n', '\\n')
return value
@@ -30,7 +30,7 @@ def parse_file(file_path):
'.//comboentrytext',
'.//message']:
for e in root.findall(i):
- result += 'const char *a{} = QT_TRANSLATE_NOOP("ProjectExplorer::CustomWizard", "{}"); // {}\n'.format(index, fix_value(e.text), file_path)
+ result += 'const char *a{} = QT_TRANSLATE_NOOP("QtC::ProjectExplorer", "{}"); // {}\n'.format(index, fix_value(e.text), file_path)
index += 1
return result
diff --git a/share/qtcreator/translations/extract-customwizards.xq b/share/qtcreator/translations/extract-customwizards.xq
index 0ded98410b9..efc6fb60c14 100644
--- a/share/qtcreator/translations/extract-customwizards.xq
+++ b/share/qtcreator/translations/extract-customwizards.xq
@@ -1,4 +1,4 @@
-let $prefix := string("QT_TRANSLATE_NOOP(&quot;ProjectExplorer::CustomWizard&quot;, &quot;")
+let $prefix := string("QT_TRANSLATE_NOOP(&quot;QtC::ProjectExplorer&quot;, &quot;")
let $suffix := concat("&quot;)", codepoints-to-string(10))
for $file in tokenize($files, string("\|"))
let $doc := doc($file)
diff --git a/share/qtcreator/translations/extract-externaltools.py b/share/qtcreator/translations/extract-externaltools.py
index 9af0de756ae..57f32869031 100644
--- a/share/qtcreator/translations/extract-externaltools.py
+++ b/share/qtcreator/translations/extract-externaltools.py
@@ -15,8 +15,8 @@ target_file = sys.argv[2]
def fix_value(value):
- value = value.replace('\"', '\\\"')
- value = value.replace('\n', '\\\n')
+ value = value.replace('\"', '\\"')
+ value = value.replace('\n', '\\n')
return value
@@ -27,7 +27,7 @@ def parse_file(file_path):
index = 0
for i in ['.//description', './/displayname', './/category']:
for e in root.findall(i):
- result += 'const char *a{} = QT_TRANSLATE_NOOP("Core::Internal::ExternalTool", "{}"); // {}\n'.format(index, fix_value(e.text), file_path)
+ result += 'const char *a{} = QT_TRANSLATE_NOOP("QtC::Core", "{}"); // {}\n'.format(index, fix_value(e.text), file_path)
index += 1
return result
diff --git a/share/qtcreator/translations/extract-externaltools.xq b/share/qtcreator/translations/extract-externaltools.xq
index f15ce8ac676..894f31d56aa 100644
--- a/share/qtcreator/translations/extract-externaltools.xq
+++ b/share/qtcreator/translations/extract-externaltools.xq
@@ -1,4 +1,4 @@
-let $prefix := string("QT_TRANSLATE_NOOP(&quot;Core::Internal::ExternalTool&quot;, &quot;")
+let $prefix := string("QT_TRANSLATE_NOOP(&quot;QtC::Core&quot;, &quot;")
let $suffix := concat("&quot;)", codepoints-to-string(10))
for $file in tokenize($files, string("\|"))
let $doc := doc($file)
diff --git a/share/qtcreator/translations/extract-jsonwizards.py b/share/qtcreator/translations/extract-jsonwizards.py
index 8a9cd7ade90..3ea3e72f58e 100644
--- a/share/qtcreator/translations/extract-jsonwizards.py
+++ b/share/qtcreator/translations/extract-jsonwizards.py
@@ -29,8 +29,8 @@ def recursive_iter(obj, key=''):
def fix_value(value):
- value = value.replace('\"', '\\\"')
- value = value.replace('\n', '\\\n')
+ value = value.replace('\"', '\\"')
+ value = value.replace('\n', '\\n')
return value
@@ -44,7 +44,7 @@ def parse_file(file_path):
for key, value in recursive_iter(root):
if key.startswith('tr'):
- result += 'const char *a{} = QT_TRANSLATE_NOOP("ProjectExplorer::JsonWizard", "{}"); // {}\n'.format(index, fix_value(value), file_path)
+ result += 'const char *a{} = QT_TRANSLATE_NOOP("QtC::ProjectExplorer", "{}"); // {}\n'.format(index, fix_value(value), file_path)
index += 1
return result
diff --git a/share/qtcreator/translations/extract-snippets.py b/share/qtcreator/translations/extract-snippets.py
index 6dcbdb5aa3e..ffaafaff984 100644
--- a/share/qtcreator/translations/extract-snippets.py
+++ b/share/qtcreator/translations/extract-snippets.py
@@ -15,8 +15,8 @@ target_file = sys.argv[2]
def fix_value(value):
- value = value.replace('\"', '\\\"')
- value = value.replace('\n', '\\\n')
+ value = value.replace('\"', '\\"')
+ value = value.replace('\n', '\\n')
return value
@@ -29,7 +29,7 @@ def parse_file(file_path):
if 'complement' in e.attrib:
text = fix_value(e.attrib['complement'])
if text:
- result += 'const char *a{} = QT_TRANSLATE_NOOP3("TextEditor::Internal::Snippets", "{}", "group:\'{}\' trigger:\'{}\'"); // {}\n' \
+ result += 'const char *a{} = QT_TRANSLATE_NOOP3("QtC::TextEditor", "{}", "group:\'{}\' trigger:\'{}\'"); // {}\n' \
.format(index, text, e.attrib['group'], e.attrib['trigger'], file_path)
index += 1
diff --git a/share/qtcreator/translations/extract-snippets.xq b/share/qtcreator/translations/extract-snippets.xq
index 0b7e52d4766..fa9d28ffa88 100644
--- a/share/qtcreator/translations/extract-snippets.xq
+++ b/share/qtcreator/translations/extract-snippets.xq
@@ -1,4 +1,4 @@
-let $prefix := string("QT_TRANSLATE_NOOP3(&quot;TextEditor::Internal::Snippets&quot;, &quot;")
+let $prefix := string("QT_TRANSLATE_NOOP3(&quot;QtC::TextEditor&quot;, &quot;")
let $midfix := string("&quot;, &quot;")
let $suffix := concat("&quot;)", codepoints-to-string(10))
for $file in tokenize($files, string("\|"))
diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index 51f7bce0421..7f62f6a363e 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -15999,7 +15999,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
</message>
</context>
<context>
- <name>OpenWith::Editors</name>
+ <name>QtC::Core</name>
<message>
<source>Plain Text Editor</source>
<translation>Editor prostého textu</translation>
@@ -16048,9 +16048,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
<source>Python Editor</source>
<translation>Editor Pythonu</translation>
</message>
-</context>
-<context>
- <name>QtC::Core</name>
<message>
<source>Preferences</source>
<translation>Nastavení</translation>
diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index d6a61620fef..cd68dfd26b1 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -19956,7 +19956,7 @@ Fejl: %5</translation>
</message>
</context>
<context>
- <name>OpenWith::Editors</name>
+ <name>QtC::Core</name>
<message>
<source>Binary Editor</source>
<translation>Binær-redigering</translation>
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 40bfc710aef..11d5737cbfb 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -9470,9 +9470,6 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
<source>Locator</source>
<translation>Locator</translation>
</message>
-</context>
-<context>
- <name>OpenWith::Editors</name>
<message>
<source>Plain Text Editor</source>
<translation>Texteditor</translation>
@@ -32671,7 +32668,9 @@ Möchten Sie sie jetzt auschecken?</translation>
<translation>Vollständig qualifizierter Name einschließlich Namensräumen</translation>
</message>
<message>
- <source>Creates a widget-based Qt application that contains a Qt Designer-based main window.Preselects a desktop Qt for building the application if available.</source>
+ <source>Creates a widget-based Qt application that contains a Qt Designer-based main window.
+
+Preselects a desktop Qt for building the application if available.</source>
<translation>Erstellt eine Widget-basierte Qt-Anwendung mit einem Qt Designer-basierten Hauptfenster.
Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfügbar ist.</translation>
@@ -32745,7 +32744,9 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<translation>C++-Bibliothek</translation>
</message>
<message>
- <source>Creates a project containing a single main.cpp file with a stub implementation.Preselects a desktop Qt for building the application if available.</source>
+ <source>Creates a project containing a single main.cpp file with a stub implementation.
+
+Preselects a desktop Qt for building the application if available.</source>
<translation>Erstellt ein Projekt, das aus einer main.cpp-Datei mit einem Implementationsrumpf besteht.
Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfügbar ist.</translation>
@@ -32803,7 +32804,9 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<translation>Qt 6</translation>
</message>
<message>
- <source>Creates a Qt Quick 2 UI project with a QML entry point. To use it, you need to have a QML runtime environment.Use this only if you are prototyping. You cannot create a full application with this. Consider using a Qt Quick Application project instead.</source>
+ <source>Creates a Qt Quick 2 UI project with a QML entry point. To use it, you need to have a QML runtime environment.
+
+Use this only if you are prototyping. You cannot create a full application with this. Consider using a Qt Quick Application project instead.</source>
<translation>Erstellt ein Qt Quick 2 UI-Projekt mit QML-Einsprungpunkt. Um es zu verwenden, brauchen Sie eine QML-Laufzeitumgebung wie qmlscene.
Benutzen Sie dies nur für Prototypen. Sie können damit keine vollständige Anwendung erstellen. Vielleicht ist ein Qt Quick-Anwendungsprojekt besser geeignet.</translation>
@@ -51200,29 +51203,8 @@ in &quot;%2&quot; aus.
<translation>Codemodell</translation>
</message>
<message>
- <source>If background indexing is enabled, global symbol searches will yield
-more accurate results, at the cost of additional CPU load when
-the project is first opened.
-The indexing result is persisted in the project&apos;s build directory.
-
-If you disable background indexing, a faster, but less accurate,
-built-in indexer is used instead.
-
-The thread priority for building the background index can be adjusted since clangd 15.
-Background Priority: Minimum priority, runs on idle CPUs. May leave &apos;performance&apos; cores unused.
-Normal Priority: Reduced priority compared to interactive work.
-Low Priority: Same priority as other clangd work.</source>
- <translation>Wenn sie das globale Indizieren aktivieren, liefert die globale Symbolsuche genauere Resultate,
-es erhöht aber die CPU-Last beim ersten Öffnen von Projekten.
-Das Resultat der Indizierung wird im Build-Verzeichnis des Projekts gespeichert.
-
-Wenn sie das globale Indizieren deaktivieren, wird stattdessen ein schnellerer,
-aber weniger genauer, integrierter Indexer benutzt.
-
-Seit Clangd 15 können Sie die Priorität für die Indizierungs-Threads anpassen.
-Hintergrund-Priorität: Niedrigste Priorität, läuft nur auf leerlaufenden CPUs. Kann &quot;Performance&quot;-Kerne ungenutzt lassen.
-Normale Priorität: Geringere Priorität im Vergleich zu interaktiven Aktivitäten.
-Niedrige Priorität: Dieselbe Priorität wie andere Clangd-Aktivitäten.</translation>
+ <source>&lt;p&gt;If background indexing is enabled, global symbol searches will yield more accurate results, at the cost of additional CPU load when the project is first opened. The indexing result is persisted in the project&apos;s build directory. If you disable background indexing, a faster, but less accurate, built-in indexer is used instead. The thread priority for building the background index can be adjusted since clangd 15.&lt;/p&gt;&lt;p&gt;Background Priority: Minimum priority, runs on idle CPUs. May leave &apos;performance&apos; cores unused.&lt;/p&gt;&lt;p&gt;Normal Priority: Reduced priority compared to interactive work.&lt;/p&gt;Low Priority: Same priority as other clangd work.</source>
+ <translation>&lt;p&gt;Wenn sie das globale Indizieren aktivieren, liefert die globale Symbolsuche genauere Resultate, es erhöht aber die CPU-Last beim ersten Öffnen von Projekten. Das Resultat der Indizierung wird im Build-Verzeichnis des Projekts gespeichert. Wenn sie das globale Indizieren deaktivieren, wird stattdessen ein schnellerer, aber weniger genauer, integrierter Indexer benutzt. Seit Clangd 15 können Sie die Priorität für die Indizierungs-Threads anpassen.&lt;/p&gt;&lt;p&gt;Hintergrund-Priorität: Niedrigste Priorität, läuft nur auf leerlaufenden CPUs. Kann &quot;Performance&quot;-Kerne ungenutzt lassen.&lt;/p&gt;&lt;p&gt;Normale Priorität: Geringere Priorität im Vergleich zu interaktiven Aktivitäten.&lt;/p&gt;Niedrige Priorität: Dieselbe Priorität wie andere Clangd-Aktivitäten.</translation>
</message>
<message>
<source>Number of worker threads used by clangd. Background indexing also uses this many worker threads.</source>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index 3d863c41696..ff32f1a64cb 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -10782,7 +10782,7 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
- <name>OpenWith::Editors</name>
+ <name>QtC::Core</name>
<message>
<source>Plain Text Editor</source>
<translation type="unfinished"></translation>
@@ -10799,9 +10799,6 @@ p, li { white-space: pre-wrap; }
<source>.pro File Editor</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>QtC::Core</name>
<message>
<source>Preferences</source>
<translation type="unfinished"></translation>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 626ec6c8ec4..5ee57efddef 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -15614,7 +15614,7 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
- <name>OpenWith::Editors</name>
+ <name>QtC::Core</name>
<message>
<source>Plain Text Editor</source>
<translation>Éditeur de texte</translation>
@@ -15663,9 +15663,6 @@ p, li { white-space: pre-wrap; }
<source>Python Editor</source>
<translation>Éditeur Python</translation>
</message>
-</context>
-<context>
- <name>QtC::Core</name>
<message>
<source>Preferences</source>
<translation>Préférences</translation>
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index 246e1c3e634..86fd5ff6388 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -15282,7 +15282,7 @@ Check the test environment.</source>
</message>
</context>
<context>
- <name>OpenWith::Editors</name>
+ <name>QtC::Core</name>
<message>
<source>Binary Editor</source>
<translation>Binarni uređivač</translation>
diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts
index 4ba28ad1b12..ad58a02fa31 100644
--- a/share/qtcreator/translations/qtcreator_hu.ts
+++ b/share/qtcreator/translations/qtcreator_hu.ts
@@ -8873,7 +8873,7 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line)
</message>
</context>
<context>
- <name>OpenWith::Editors</name>
+ <name>QtC::Core</name>
<message>
<source>Plain Text Editor</source>
<translation>Egyszerű szöveg szerkesztő</translation>
@@ -8890,9 +8890,6 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line)
<source>.pro File Editor</source>
<translation>.pro fájl szerkesztő</translation>
</message>
-</context>
-<context>
- <name>QtC::Core</name>
<message>
<source>Open File With...</source>
<translation>Fájl megnyitása ezzel...</translation>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 4f4d56d6d5b..ccd8832a98b 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -10584,7 +10584,7 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
- <name>OpenWith::Editors</name>
+ <name>QtC::Core</name>
<message>
<source>Plain Text Editor</source>
<translation type="unfinished"></translation>
@@ -10601,9 +10601,6 @@ p, li { white-space: pre-wrap; }
<source>.pro File Editor</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>QtC::Core</name>
<message>
<source>Preferences</source>
<translation type="unfinished"></translation>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 102bd9d5c30..2f55dfdb0d5 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -12126,7 +12126,7 @@ in the system&apos;s browser for manual download.</source>
</message>
</context>
<context>
- <name>OpenWith::Editors</name>
+ <name>QtC::Core</name>
<message>
<source>Binary Editor</source>
<translation>バイナリエディタ</translation>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 2edfb640ad6..702550d9e55 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts