feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge "Merge remote-tracking branch 'origin/10.0'"

Browse Source
This commit is contained in:
The Qt Project
2023-05-17 14:23:50 +00:00
parent 07b2a30dfe 8e8ebc8f88
commit 7057962e44
13 changed files with 165 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/instructions/build.yaml
View File

@@ -31,7 +31,7 @@ instructions:
maxTimeBetweenOutput: 3600 maxTimeBetweenOutput: 3600
userMessageOnFailure: "Failed to run build.py, check logs." userMessageOnFailure: "Failed to run build.py, check logs."
- type: ChangeDirectory - type: ChangeDirectory
directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools" directory: "{{.AgentWorkingDir}}/build/tqtc-qtsdk/packaging_tools"
- type: ExecuteCommand - type: ExecuteCommand
command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make" command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make"
maxTimeInSeconds: 36000 maxTimeInSeconds: 36000
@@ -65,7 +65,7 @@ instructions:
maxTimeBetweenOutput: 3600 maxTimeBetweenOutput: 3600
userMessageOnFailure: "Failed to run build.py, check logs." userMessageOnFailure: "Failed to run build.py, check logs."
- type: ChangeDirectory - type: ChangeDirectory
directory: "{{.AgentWorkingDir}}/build/qtsdk/packaging-tools" directory: "{{.AgentWorkingDir}}/build/tqtc-qtsdk/packaging_tools"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: MACOSX_DEPLOYMENT_TARGET variableName: MACOSX_DEPLOYMENT_TARGET
variableValue: "{{.Env.SDKTOOL_MACOSX_DEPLOYMENT_TARGET}}" variableValue: "{{.Env.SDKTOOL_MACOSX_DEPLOYMENT_TARGET}}"
@@ -117,7 +117,7 @@ instructions:
maxTimeBetweenOutput: 3600 maxTimeBetweenOutput: 3600
userMessageOnFailure: "Failed to run build.py, check logs." userMessageOnFailure: "Failed to run build.py, check logs."
- type: ChangeDirectory - type: ChangeDirectory
directory: "{{.AgentWorkingDir}}\\build\\qtsdk\\packaging-tools" directory: "{{.AgentWorkingDir}}\\build\\tqtc-qtsdk\\packaging_tools"
- type: ExecuteCommand - type: ExecuteCommand
command: "python -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}\\build\\sdktool\\qt --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\src\\tools\\sdktool --build {{.AgentWorkingDir}}\\build\\sdktool\\build --install {{.AgentWorkingDir}}\\build\\sdktool\\install --make-command nmake" command: "python -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}\\build\\sdktool\\qt --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\src\\tools\\sdktool --build {{.AgentWorkingDir}}\\build\\sdktool\\build --install {{.AgentWorkingDir}}\\build\\sdktool\\install --make-command nmake"
maxTimeInSeconds: 36000 maxTimeInSeconds: 36000

9
coin/instructions/provision.yaml
View File

@@ -16,13 +16,6 @@ instructions:
directory: "{{.BuildDir}}" directory: "{{.BuildDir}}"
- type: ChangeDirectory - type: ChangeDirectory
directory: "{{.BuildDir}}" directory: "{{.BuildDir}}"
- type: InstallSourceArchive
maxTimeInSeconds: 600
maxTimeBetweenOutput: 600
project: qtsdk/qtsdk
ref: master
directory: "build/qtsdk"
userMessageOnFailure: "Failed to install qtsdk, check logs"
- type: InstallSourceArchive - type: InstallSourceArchive
maxTimeInSeconds: 600 maxTimeInSeconds: 600
maxTimeBetweenOutput: 600 maxTimeBetweenOutput: 600
@@ -57,7 +50,7 @@ instructions:
property: host.os property: host.os
not_equals_value: Windows not_equals_value: Windows
- type: ChangeDirectory - type: ChangeDirectory
directory: "{{.BuildDir}}/qtsdk/packaging-tools" directory: "{{.BuildDir}}/tqtc-qtsdk/packaging_tools"
- type: ExecuteCommand - type: ExecuteCommand
command: "python3 -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z http://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}" command: "python3 -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z http://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution

2
doc/qtcreator/src/user-interface/creator-views.qdoc
View File

@@ -88,6 +88,7 @@
(\uicontrol {Synchronize with Editor}). (\uicontrol {Synchronize with Editor}).
\endlist \endlist
\if defined(qtcreator)
\section1 Viewing the Class Hierarchy \section1 Viewing the Class Hierarchy
The \uicontrol {Class View} shows the class hierarchy of the currently The \uicontrol {Class View} shows the class hierarchy of the currently
@@ -144,4 +145,5 @@
To keep the view synchronized with the file currently open in the editor, To keep the view synchronized with the file currently open in the editor,
select \inlineimage icons/linkicon.png select \inlineimage icons/linkicon.png
(\uicontrol {Synchronize with Editor}). (\uicontrol {Synchronize with Editor}).
\endif
*/ */

232
share/qtcreator/translations/qtcreator_de.ts
View File

@@ -13850,315 +13850,315 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
<name>QtC::CVS</name> <name>QtC::CVS</name>
<message> <message>
<source>Annotate revision &quot;%1&quot;</source> <source>Annotate revision &quot;%1&quot;</source>
<translation type="unfinished">Annotation für Revision &quot;%1&quot;</translation> <translation>Annotation für Revision &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Ignore Whitespace</source> <source>Ignore Whitespace</source>
<translation type="unfinished">Leerzeichen ignorieren</translation> <translation>Leerzeichen ignorieren</translation>
</message> </message>
<message> <message>
<source>Ignore Blank Lines</source> <source>Ignore Blank Lines</source>
<translation type="unfinished">Leerzeilen ignorieren</translation> <translation>Leerzeilen ignorieren</translation>
</message> </message>
<message> <message>
<source>&amp;Edit</source> <source>&amp;Edit</source>
<translation type="unfinished"></translation> <translation>B&amp;earbeiten</translation>
</message> </message>
<message> <message>
<source>CVS Checkout</source> <source>CVS Checkout</source>
<translation type="unfinished">CVS-Checkout</translation> <translation>CVS-Checkout</translation>
</message> </message>
<message> <message>
<source>Triggers a CVS version control operation.</source> <source>Triggers a CVS version control operation.</source>
<translation type="unfinished"></translation> <translation>Führt eine Aktion des CVS-Versionskontrollsystems aus.</translation>
</message> </message>
<message> <message>
<source>&amp;CVS</source> <source>&amp;CVS</source>
<translation type="unfinished">&amp;CVS</translation> <translation>&amp;CVS</translation>
</message> </message>
<message> <message>
<source>Diff Current File</source> <source>Diff Current File</source>
<translation type="unfinished"></translation> <translation>Diff für aktuelle Datei</translation>
</message> </message>
<message> <message>
<source>Diff &quot;%1&quot;</source> <source>Diff &quot;%1&quot;</source>
<translation type="unfinished">Diff für &quot;%1&quot;</translation> <translation>Diff für &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Meta+C,Meta+D</source> <source>Meta+C,Meta+D</source>
<translation type="unfinished">Meta+C,Meta+D</translation> <translation>Meta+C,Meta+D</translation>
</message> </message>
<message> <message>
<source>Alt+C,Alt+D</source> <source>Alt+C,Alt+D</source>
<translation type="unfinished">Alt+C,Alt+D</translation> <translation>Alt+C,Alt+D</translation>
</message> </message>
<message> <message>
<source>Filelog Current File</source> <source>Filelog Current File</source>
<translation type="unfinished">Filelog für Datei</translation> <translation>Filelog für aktuelle Datei</translation>
</message> </message>
<message> <message>
<source>Filelog &quot;%1&quot;</source> <source>Filelog &quot;%1&quot;</source>
<translation type="unfinished">Filelog für &quot;%1&quot;</translation> <translation>Filelog für &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Annotate Current File</source> <source>Annotate Current File</source>
<translation type="unfinished">Annotation für Datei</translation> <translation>Annotation für aktuelle Datei</translation>
</message> </message>
<message> <message>
<source>Annotate &quot;%1&quot;</source> <source>Annotate &quot;%1&quot;</source>
<translation type="unfinished">Annotation für &quot;%1&quot;</translation> <translation>Annotation für &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Add</source> <source>Add</source>
<translation type="unfinished">Hinzufügen</translation> <translation>Hinzufügen</translation>
</message> </message>
<message> <message>
<source>Add &quot;%1&quot;</source> <source>Add &quot;%1&quot;</source>
<translation type="unfinished">&quot;%1&quot; hinzufügen</translation> <translation>&quot;%1&quot; hinzufügen</translation>
</message> </message>
<message> <message>
<source>Meta+C,Meta+A</source> <source>Meta+C,Meta+A</source>
<translation type="unfinished">Meta+C,Meta+A</translation> <translation>Meta+C,Meta+A</translation>
</message> </message>
<message> <message>
<source>Alt+C,Alt+A</source> <source>Alt+C,Alt+A</source>
<translation type="unfinished">Alt+C,Alt+A</translation> <translation>Alt+C,Alt+A</translation>
</message> </message>
<message> <message>
<source>Commit Current File</source> <source>Commit Current File</source>
<translation type="unfinished">Commit der aktuellen Datei</translation> <translation>Commit der aktuellen Datei</translation>
</message> </message>
<message> <message>
<source>Commit &quot;%1&quot;</source> <source>Commit &quot;%1&quot;</source>
<translation type="unfinished">Commit von &quot;%1&quot;</translation> <translation>Commit von &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Meta+C,Meta+C</source> <source>Meta+C,Meta+C</source>
<translation type="unfinished">Meta+C,Meta+C</translation> <translation>Meta+C,Meta+C</translation>
</message> </message>
<message> <message>
<source>Alt+C,Alt+C</source> <source>Alt+C,Alt+C</source>
<translation type="unfinished">Alt+C,Alt+C</translation> <translation>Alt+C,Alt+C</translation>
</message> </message>
<message> <message>
<source>Delete...</source> <source>Delete...</source>
<translation type="unfinished">Löschen...</translation> <translation>Löschen...</translation>
</message> </message>
<message> <message>
<source>Delete &quot;%1&quot;...</source> <source>Delete &quot;%1&quot;...</source>
<translation type="unfinished">Lösche &quot;%1&quot;...</translation> <translation>Lösche &quot;%1&quot;...</translation>
</message> </message>
<message> <message>
<source>Revert...</source> <source>Revert...</source>
<translation type="unfinished">Rückgängig machen...</translation> <translation>Rückgängig machen...</translation>
</message> </message>
<message> <message>
<source>Revert &quot;%1&quot;...</source> <source>Revert &quot;%1&quot;...</source>
<translation type="unfinished">Änderungen in &quot;%1&quot; rückgängig machen...</translation> <translation>Änderungen in &quot;%1&quot; rückgängig machen...</translation>
</message> </message>
<message> <message>
<source>Edit</source> <source>Edit</source>
<translation type="unfinished"></translation> <translation>Anfordern (edit)</translation>
</message> </message>
<message> <message>
<source>Edit &quot;%1&quot;</source> <source>Edit &quot;%1&quot;</source>
<translation type="unfinished">&quot;%1&quot; anfordern</translation> <translation>&quot;%1&quot; anfordern (edit)</translation>
</message> </message>
<message> <message>
<source>Unedit</source> <source>Unedit</source>
<translation type="unfinished">Anforderung zurücknehmen</translation> <translation>Anforderung zurücknehmen (unedit)</translation>
</message> </message>
<message> <message>
<source>Unedit &quot;%1&quot;</source> <source>Unedit &quot;%1&quot;</source>
<translation type="unfinished">Anforderung der Datei &apos;%1&quot; zurücknehmen</translation> <translation>Anforderung der Datei &apos;%1&quot; zurücknehmen (unedit)</translation>
</message> </message>
<message> <message>
<source>Unedit Repository</source> <source>Unedit Repository</source>
<translation type="unfinished">Anforderung im gesamten Repository zurücknehmen</translation> <translation>Anforderung im gesamten Repository zurücknehmen (unedit)</translation>
</message> </message>
<message> <message>
<source>Diff Project</source> <source>Diff Project</source>
<translation type="unfinished">Diff für Projekt</translation> <translation>Diff für Projekt</translation>
</message> </message>
<message> <message>
<source>Diff Project &quot;%1&quot;</source> <source>Diff Project &quot;%1&quot;</source>
<translation type="unfinished">Diff für Projekt &quot;%1&quot;</translation> <translation>Diff für Projekt &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Project Status</source> <source>Project Status</source>
<translation type="unfinished">Status des Projekts (status)</translation> <translation>Status des Projekts</translation>
</message> </message>
<message> <message>
<source>Status of Project &quot;%1&quot;</source> <source>Status of Project &quot;%1&quot;</source>
<translation type="unfinished">Status des Projekts &quot;%1&quot;</translation> <translation>Status des Projekts &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Log Project</source> <source>Log Project</source>
<translation type="unfinished">Log für Projekt</translation> <translation>Log für Projekt</translation>
</message> </message>
<message> <message>
<source>Log Project &quot;%1&quot;</source> <source>Log Project &quot;%1&quot;</source>
<translation type="unfinished">Log für Projekt &quot;%1&quot;</translation> <translation>Log für Projekt &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Update Project</source> <source>Update Project</source>
<translation type="unfinished">Projekt auf aktuellen Stand bringen</translation> <translation>Projekt auf aktuellen Stand bringen</translation>
</message> </message>
<message> <message>
<source>Update Project &quot;%1&quot;</source> <source>Update Project &quot;%1&quot;</source>
<translation type="unfinished">Projekt &quot;%1&quot;auf aktuellen Stand bringen</translation> <translation>Projekt &quot;%1&quot; auf aktuellen Stand bringen</translation>
</message> </message>
<message> <message>
<source>Commit Project</source> <source>Commit Project</source>
<translation type="unfinished">Commit des Projekts</translation> <translation>Commit des Projekts</translation>
</message> </message>
<message> <message>
<source>Commit Project &quot;%1&quot;</source> <source>Commit Project &quot;%1&quot;</source>
<translation type="unfinished">Commit des Projekts &quot;%1&quot;</translation> <translation>Commit des Projekts &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Update Directory</source> <source>Update Directory</source>
<translation type="unfinished">Verzeichnis aktualisieren</translation> <translation>Verzeichnis aktualisieren</translation>
</message> </message>
<message> <message>
<source>Update Directory &quot;%1&quot;</source> <source>Update Directory &quot;%1&quot;</source>
<translation type="unfinished">Verzeichnis &quot;%1&quot; aktualisieren</translation> <translation>Verzeichnis &quot;%1&quot; aktualisieren</translation>
</message> </message>
<message> <message>
<source>Commit Directory</source> <source>Commit Directory</source>
<translation type="unfinished">Commit des Verzeichnisses</translation> <translation>Commit des Verzeichnisses</translation>
</message> </message>
<message> <message>
<source>Commit Directory &quot;%1&quot;</source> <source>Commit Directory &quot;%1&quot;</source>
<translation type="unfinished">Commit des Verzeichnisses &quot;%1&quot;</translation> <translation>Commit des Verzeichnisses &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Diff Repository</source> <source>Diff Repository</source>
<translation type="unfinished">Diff des Repositorys</translation> <translation>Diff des Repositorys</translation>
</message> </message>
<message> <message>
<source>Repository Status</source> <source>Repository Status</source>
<translation type="unfinished">Status des Repositorys</translation> <translation>Status des Repositorys</translation>
</message> </message>
<message> <message>
<source>Repository Log</source> <source>Repository Log</source>
<translation type="unfinished">Log des Repositorys</translation> <translation>Log des Repositorys</translation>
</message> </message>
<message> <message>
<source>Update Repository</source> <source>Update Repository</source>
<translation type="unfinished">Repository auf den aktuellen Stand bringen</translation> <translation>Repository auf den aktuellen Stand bringen</translation>
</message> </message>
<message> <message>
<source>Commit All Files</source> <source>Commit All Files</source>
<translation type="unfinished">Commit aller Dateien</translation> <translation>Commit aller Dateien</translation>
</message> </message>
<message> <message>
<source>Revert Repository...</source> <source>Revert Repository...</source>
<translation type="unfinished">Änderungen im gesamten Repository rückgängig machen...</translation> <translation>Änderungen im gesamten Repository rückgängig machen...</translation>
</message> </message>
<message> <message>
<source>Revert Repository</source> <source>Revert Repository</source>
<translation type="unfinished">Alle Änderungen rückgängig machen</translation> <translation>Änderungen im gesamten Repository rückgängig machen</translation>
</message> </message>
<message> <message>
<source>Revert all pending changes to the repository?</source> <source>Revert all pending changes to the repository?</source>
<translation type="unfinished">Möchten Sie alle ausstehenden Änderungen des Repositorys verwerfen?</translation> <translation>Möchten Sie alle ausstehenden Änderungen des Repositorys verwerfen?</translation>
</message> </message>
<message> <message>
<source>Revert failed: %1</source> <source>Revert failed: %1</source>
<translation type="unfinished">Fehler beim Rücksetzen der Änderungen: %1</translation> <translation>Fehler beim Rückgängigmachen der Änderungen: %1</translation>
</message> </message>
<message> <message>
<source>The file has been changed. Do you want to revert it?</source> <source>The file has been changed. Do you want to revert it?</source>
<translation type="unfinished"></translation> <translation>Die Datei wurde geändert. Möchten Sie die Änderungen rückgängig machen?</translation>
</message> </message>
<message> <message>
<source>Another commit is currently being executed.</source> <source>Another commit is currently being executed.</source>
<translation type="unfinished">Es läuft bereits ein Commit-Vorgang.</translation> <translation>Es läuft bereits ein Commit-Vorgang.</translation>
</message> </message>
<message> <message>
<source>There are no modified files.</source> <source>There are no modified files.</source>
<translation type="unfinished">Es gibt keine geänderten Dateien.</translation> <translation>Es gibt keine geänderten Dateien.</translation>
</message> </message>
<message> <message>
<source>Would you like to discard your changes to the repository &quot;%1&quot;?</source> <source>Would you like to discard your changes to the repository &quot;%1&quot;?</source>
<translation type="unfinished">Möchten Sie alle ausstehenden Änderungen des Repositorys &quot;%1&quot; verwerfen?</translation> <translation>Möchten Sie alle ausstehenden Änderungen des Repositorys &quot;%1&quot; verwerfen?</translation>
</message> </message>
<message> <message>
<source>Would you like to discard your changes to the file &quot;%1&quot;?</source> <source>Would you like to discard your changes to the file &quot;%1&quot;?</source>
<translation type="unfinished">Möchten Sie alle ausstehenden Änderungen in der Datei &quot;%1&quot; verwerfen?</translation> <translation>Möchten Sie alle ausstehenden Änderungen in der Datei &quot;%1&quot; verwerfen?</translation>
</message> </message>
<message> <message>
<source>Project status</source> <source>Project status</source>
<translation type="unfinished">Status des Projekts</translation> <translation>Status des Projekts</translation>
</message> </message>
<message> <message>
<source>Repository status</source> <source>Repository status</source>
<translation type="unfinished">Status des Repositorys</translation> <translation>Status des Repositorys</translation>
</message> </message>
<message> <message>
<source>Cannot find repository for &quot;%1&quot;.</source> <source>Cannot find repository for &quot;%1&quot;.</source>
<translation type="unfinished">Kann das Repository für &quot;%1&quot; nicht finden.</translation> <translation>Kann das Repository für &quot;%1&quot; nicht finden.</translation>
</message> </message>
<message> <message>
<source>The initial revision %1 cannot be described.</source> <source>The initial revision %1 cannot be described.</source>
<translation type="unfinished">Die erste Version (%1) kann nicht weiter beschrieben werden.</translation> <translation>Die erste Version (%1) kann nicht beschrieben werden.</translation>
</message> </message>
<message> <message>
<source>Parsing of the log output failed.</source> <source>Parsing of the log output failed.</source>
<translation type="unfinished">Die Log-Ausgabe konnte nicht ausgewertet werden.</translation> <translation>Die Log-Ausgabe konnte nicht ausgewertet werden.</translation>
</message> </message>
<message> <message>
<source>Could not find commits of id &quot;%1&quot; on %2.</source> <source>Could not find commits of id &quot;%1&quot; on %2.</source>
<translation type="unfinished">Es konnten keine Commits des Datums %2 mit der ID &quot;%1&quot; gefunden werden.</translation> <translation>Es konnten keine Commits des Datums %2 mit der ID &quot;%1&quot; gefunden werden.</translation>
</message> </message>
<message> <message>
<source>No CVS executable specified.</source> <source>No CVS executable specified.</source>
<translation type="unfinished">Es wurde keine ausführbare Datei für CVS angegeben.</translation> <translation>Es wurde keine ausführbare Datei für CVS angegeben.</translation>
</message> </message>
<message> <message>
<source>CVS Command</source> <source>CVS Command</source>
<translation type="unfinished">CVS-Kommando</translation> <translation>CVS-Kommando</translation>
</message> </message>
<message> <message>
<source>CVS command:</source> <source>CVS command:</source>
<translation type="unfinished">CVS-Kommando:</translation> <translation>CVS-Kommando:</translation>
</message> </message>
<message> <message>
<source>CVS root:</source> <source>CVS root:</source>
<translation type="unfinished">CVS-Quelle (CVSROOT):</translation> <translation>CVS-Quelle (CVSROOT):</translation>
</message> </message>
<message> <message>
<source>Describe all files matching commit id</source> <source>Describe all files matching commit id</source>
<translation type="unfinished">Alle zur Commit-ID gehörenden Dateien beschreiben</translation> <translation>Alle zur Commit-ID gehörenden Dateien beschreiben</translation>
</message> </message>
<message> <message>
<source>When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit ID). Otherwise, only the respective file will be displayed.</source> <source>When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit ID). Otherwise, only the respective file will be displayed.</source>
<translation type="unfinished">Wenn die Option aktiviert ist, werden beim Klick auf die Revisionsnummer in der Annotationsansicht alle Dateien angezeigt, die zu einem Commit gehören (mittels Commit-ID bestimmt). Ansonsten wird nur die betreffende Datei angezeigt.</translation> <translation>Wenn die Option aktiviert ist, werden beim Klick auf die Revisionsnummer in der Annotationsansicht alle Dateien angezeigt, die zu einem Commit gehören (mittels Commit-ID bestimmt). Ansonsten wird nur die betreffende Datei angezeigt.</translation>
</message> </message>
<message> <message>
<source>CVS</source> <source>CVS</source>
<translation type="unfinished">CVS</translation> <translation>CVS</translation>
</message> </message>
<message> <message>
<source>Configuration</source> <source>Configuration</source>
<translation type="unfinished">Konfiguration</translation> <translation>Konfiguration</translation>
</message> </message>
<message> <message>
<source>Miscellaneous</source> <source>Miscellaneous</source>
<translation type="unfinished">Sonstige Einstellungen</translation> <translation>Sonstige Einstellungen</translation>
</message> </message>
<message> <message>
<source>Added</source> <source>Added</source>
<translation type="unfinished">Hinzugefügt</translation> <translation>Hinzugefügt</translation>
</message> </message>
<message> <message>
<source>Removed</source> <source>Removed</source>
<translation type="unfinished">Gelöscht</translation> <translation>Gelöscht</translation>
</message> </message>
<message> <message>
<source>Modified</source> <source>Modified</source>
<translation type="unfinished">Geändert</translation> <translation>Geändert</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -29091,7 +29091,7 @@ Nicht markiert - Die Änderung ist kein Entwurf.</translation>
</message> </message>
<message> <message>
<source>Filter log entries by text in the commit message.</source> <source>Filter log entries by text in the commit message.</source>
<translation>Log-Einträge nach Nachrichtentext filtern.</translation> <translation>Log-Einträge nach Beschreibung filtern.</translation>
</message> </message>
<message> <message>
<source>Filter by content</source> <source>Filter by content</source>
@@ -34170,7 +34170,7 @@ You might find further explanations in the Application Output view.</source>
</message> </message>
<message> <message>
<source>Update Project &quot;%1&quot;</source> <source>Update Project &quot;%1&quot;</source>
<translation>Projekt &quot;%1&quot;auf aktuellen Stand bringen</translation> <translation>Projekt &quot;%1&quot; auf aktuellen Stand bringen</translation>
</message> </message>
<message> <message>
<source>Describe...</source> <source>Describe...</source>
@@ -47616,7 +47616,7 @@ Failed to open file &quot;%1&quot;</source>
</message> </message>
<message> <message>
<source>Update Project &quot;%1&quot;</source> <source>Update Project &quot;%1&quot;</source>
<translation>Projekt &quot;%1&quot;auf aktuellen Stand bringen</translation> <translation>Projekt &quot;%1&quot; auf aktuellen Stand bringen</translation>
</message> </message>
<message> <message>
<source>Revert Repository...</source> <source>Revert Repository...</source>
@@ -53075,7 +53075,7 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch
</message> </message>
<message> <message>
<source>Clean Repository</source> <source>Clean Repository</source>
<translation type="unfinished">Repository bereinigen</translation> <translation>Repository bereinigen</translation>
</message> </message>
<message> <message>
<source>Delete...</source> <source>Delete...</source>
@@ -53190,25 +53190,25 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch
</message> </message>
<message> <message>
<source>Warning: The commit subject is very short.</source> <source>Warning: The commit subject is very short.</source>
<translation type="unfinished"></translation> <translation>Warnung: Der Titel des Commits ist sehr kurz.</translation>
</message> </message>
<message> <message>
<source>Warning: The commit subject is too long.</source> <source>Warning: The commit subject is too long.</source>
<translation type="unfinished"></translation> <translation>Warnung: Der Titel des Commits ist zu lang.</translation>
</message> </message>
<message> <message>
<source>Hint: Aim for a shorter commit subject.</source> <source>Hint: Aim for a shorter commit subject.</source>
<translation type="unfinished"></translation> <translation>Hinweis: Versuchen Sie, einen kürzeren Titel zu vergeben.</translation>
</message> </message>
<message> <message>
<source>Hint: The second line of a commit message should be empty.</source> <source>Hint: The second line of a commit message should be empty.</source>
<translation type="unfinished"></translation> <translation>Hinweis: Die zweite Zeile der Beschreibung sollte leer sein.</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>&lt;p&gt;Writing good commit messages&lt;/p&gt;&lt;ul&gt;&lt;li&gt;Avoid very short commit messages.&lt;/li&gt;&lt;li&gt;Consider the first line as subject (like in email) and keep it shorter than %n characters.&lt;/li&gt;&lt;li&gt;After an empty second line, a longer description can be added.&lt;/li&gt;&lt;li&gt;Describe why the change was done, not how it was done.&lt;/li&gt;&lt;/ul&gt;</source> <source>&lt;p&gt;Writing good commit messages&lt;/p&gt;&lt;ul&gt;&lt;li&gt;Avoid very short commit messages.&lt;/li&gt;&lt;li&gt;Consider the first line as subject (like in email) and keep it shorter than %n characters.&lt;/li&gt;&lt;li&gt;After an empty second line, a longer description can be added.&lt;/li&gt;&lt;li&gt;Describe why the change was done, not how it was done.&lt;/li&gt;&lt;/ul&gt;</source>
<translation type="unfinished"> <translation>
<numerusform></numerusform> <numerusform>&lt;p&gt;Gute Beschreibungen für Commits schreiben&lt;/p&gt;&lt;ul&gt;&lt;li&gt;Vermeiden Sie sehr kurze Beschreibungen.&lt;/li&gt;&lt;li&gt;Betrachten Sie die erste Zeile als Betreff (wie in einer E-Mail) und halten Sie sie kürzer als ein Zeichen.&lt;/li&gt;&lt;li&gt;Eine längere Beschreibung kann nach einer leeren zweiten Zeile folgen.&lt;/li&gt;&lt;li&gt;Beschreiben Sie, weshalb die Änderung vorgenommen wurde, nicht wie sie vorgenommen wurde.&lt;/li&gt;&lt;/ul&gt;</numerusform>
<numerusform></numerusform> <numerusform>&lt;p&gt;Gute Beschreibungen für Commits schreiben&lt;/p&gt;&lt;ul&gt;&lt;li&gt;Vermeiden Sie sehr kurze Beschreibungen.&lt;/li&gt;&lt;li&gt;Betrachten Sie die erste Zeile als Betreff (wie in einer E-Mail) und halten Sie sie kürzer als %n Zeichen.&lt;/li&gt;&lt;li&gt;Eine längere Beschreibung kann nach einer leeren zweiten Zeile folgen.&lt;/li&gt;&lt;li&gt;Beschreiben Sie, weshalb die Änderung vorgenommen wurde, nicht wie sie vorgenommen wurde.&lt;/li&gt;&lt;/ul&gt;</numerusform>
</translation> </translation>
</message> </message>
<message> <message>
@@ -53263,11 +53263,11 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch
</message> </message>
<message> <message>
<source>Running: %1</source> <source>Running: %1</source>
<translation type="unfinished">Führe aus: %1</translation> <translation>Führe aus: %1</translation>
</message> </message>
<message> <message>
<source>Running in %1: %2</source> <source>Running in %1: %2</source>
<translation type="unfinished">Führe in %1 aus: %2 {1:?}</translation> <translation>Führe in %1 aus: %2</translation>
</message> </message>
<message> <message>
<source>Failed to retrieve data.</source> <source>Failed to retrieve data.</source>
@@ -53307,7 +53307,7 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch
</message> </message>
<message> <message>
<source>Command started...</source> <source>Command started...</source>
<translation type="unfinished">Kommando gestartet...</translation> <translation>Kommando gestartet...</translation>
</message> </message>
<message> <message>
<source>Checkout</source> <source>Checkout</source>
@@ -53315,15 +53315,15 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch
</message> </message>
<message> <message>
<source>No job running, please abort.</source> <source>No job running, please abort.</source>
<translation type="unfinished">Kein laufender Job, bitte brechen Sie ab.</translation> <translation>Kein laufender Job, bitte brechen Sie ab.</translation>
</message> </message>
<message> <message>
<source>Succeeded.</source> <source>Succeeded.</source>
<translation type="unfinished">Erfolgreich beendet.</translation> <translation>Erfolgreich beendet.</translation>
</message> </message>
<message> <message>
<source>Failed.</source> <source>Failed.</source>
<translation type="unfinished">Fehlgeschlagen.</translation> <translation>Fehlgeschlagen.</translation>
</message> </message>
<message> <message>
<source>&quot;%1&quot; (%2) not found.</source> <source>&quot;%1&quot; (%2) not found.</source>
@@ -53404,91 +53404,91 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch
</message> </message>
<message> <message>
<source>User/&amp;alias configuration file:</source> <source>User/&amp;alias configuration file:</source>
<translation type="unfinished">Nutzer/&amp;Alias-Konfigurationsdatei:</translation> <translation>Nutzer/&amp;Alias-Konfigurationsdatei:</translation>
</message> </message>
<message> <message>
<source>A file listing nicknames in a 4-column mailmap format: <source>A file listing nicknames in a 4-column mailmap format:
&apos;name &lt;email&gt; alias &lt;email&gt;&apos;.</source> &apos;name &lt;email&gt; alias &lt;email&gt;&apos;.</source>
<translation type="unfinished">Eine Datei, die Nutzernamen in einem vierspaltigen Format (mailmap) enthält: <translation>Eine Datei, die Nutzernamen in einem vierspaltigen Format (mailmap) enthält:
&apos;Name &lt;E-Mail&gt; Alias &lt;E-Mail&gt;&apos;.</translation> &apos;Name &lt;E-Mail&gt; Alias &lt;E-Mail&gt;&apos;.</translation>
</message> </message>
<message> <message>
<source>User &amp;fields configuration file:</source> <source>User &amp;fields configuration file:</source>
<translation type="unfinished">Nutzer&amp;feld-Konfigurationsdatei:</translation> <translation>Nutzer&amp;feld-Konfigurationsdatei:</translation>
</message> </message>
<message> <message>
<source>A simple file containing lines with field names like &quot;Reviewed-By:&quot; which will be added below the submit editor.</source> <source>A simple file containing lines with field names like &quot;Reviewed-By:&quot; which will be added below the submit editor.</source>
<translation type="unfinished">Eine Datei, die Zeilen mit Feldnamen (zum Beispiel &quot;Reviewed-By:&quot;) enthält, die im Abgabefenster unter der Beschreibung erscheinen.</translation> <translation>Eine Datei, die Zeilen mit Feldnamen (zum Beispiel &quot;Reviewed-By:&quot;) enthält, die im Abgabefenster unter der Beschreibung erscheinen.</translation>
</message> </message>
<message> <message>
<source>Submit message &amp;check script:</source> <source>Submit message &amp;check script:</source>
<translation type="unfinished">Skript zur &amp;Überprüfung der Beschreibung:</translation> <translation>Skript zur &amp;Überprüfung der Beschreibung:</translation>
</message> </message>
<message> <message>
<source>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</source> <source>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</source>
<translation type="unfinished">Eine ausführbare Datei, die mit der Beschreibung in einer temporären Datei als erstem Kommandozeilenparameter aufgerufen wird. Bei Fehlschlag sollte sie einen Rückgabewert ungleich Null mit einer entsprechende Nachricht auf der Fehlerausgabe zurückgeben.</translation> <translation>Eine ausführbare Datei, die mit der Beschreibung in einer temporären Datei als erstem Kommandozeilenparameter aufgerufen wird. Bei Fehlschlag sollte sie einen Rückgabewert ungleich Null mit einer entsprechenden Nachricht auf der Fehlerausgabe zurückgeben.</translation>
</message> </message>
<message> <message>
<source>&amp;SSH prompt command:</source> <source>&amp;SSH prompt command:</source>
<translation type="unfinished">Graphische &amp;SSH-Passwortabfrage:</translation> <translation>Graphische &amp;SSH-Passwortabfrage:</translation>
</message> </message>
<message> <message>
<source>Specifies a command that is executed to graphically prompt for a password, <source>Specifies a command that is executed to graphically prompt for a password,
should a repository require SSH-authentication (see documentation on SSH and the environment variable SSH_ASKPASS).</source> should a repository require SSH-authentication (see documentation on SSH and the environment variable SSH_ASKPASS).</source>
<translation type="unfinished">Kommando zur graphischen Passwortabfrage bei SSH-Authorisierung eines Repositorys <translation>Kommando zur graphischen Passwortabfrage bei SSH-Authorisierung eines Repositorys
(siehe SSH-Dokumentation zur Umgebungsvariable SSH-ASKPASS).</translation> (siehe SSH-Dokumentation zur Umgebungsvariable SSH-ASKPASS).</translation>
</message> </message>
<message> <message>
<source>Wrap submit message at:</source> <source>Wrap submit message at:</source>
<translation type="unfinished">Beschreibung umbrechen bei:</translation> <translation>Beschreibung umbrechen bei:</translation>
</message> </message>
<message> <message>
<source> characters</source> <source> characters</source>
<translation type="unfinished"> Zeichen</translation> <translation> Zeichen</translation>
</message> </message>
<message> <message>
<source>Reset VCS Cache</source> <source>Reset VCS Cache</source>
<translation type="unfinished">VCS-Cache zurücksetzen</translation> <translation>VCS-Cache zurücksetzen</translation>
</message> </message>
<message> <message>
<source>Reset information about which version control system handles which directory.</source> <source>Reset information about which version control system handles which directory.</source>
<translation type="unfinished">Die Zuordnung, welches Versionsverwaltungssystem welches Verzeichnis behandelt, zurücksetzen.</translation> <translation>Die Zuordnung zurücksetzen, welches Versionsverwaltungssystem welches Verzeichnis behandelt.</translation>
</message> </message>
<message> <message>
<source>Log count:</source> <source>Log count:</source>
<translation type="unfinished">Log-Anzeige beschränken auf:</translation> <translation>Log-Anzeige beschränken auf:</translation>
</message> </message>
<message> <message>
<source>Timeout:</source> <source>Timeout:</source>
<translation type="unfinished">Zeitlimit:</translation> <translation>Zeitlimit:</translation>
</message> </message>
<message> <message>
<source>s</source> <source>s</source>
<translation type="unfinished">s</translation> <translation>s</translation>
</message> </message>
<message> <message>
<source>&amp;Open &quot;%1&quot;</source> <source>&amp;Open &quot;%1&quot;</source>
<translation type="unfinished"></translation> <translation>&quot;%1&quot; ö&amp;ffnen</translation>
</message> </message>
<message> <message>
<source>&amp;Copy to clipboard: &quot;%1&quot;</source> <source>&amp;Copy to clipboard: &quot;%1&quot;</source>
<translation type="unfinished"></translation> <translation>In die Zwischenablage &amp;kopieren: &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<source>Fossil File Log Editor</source> <source>Fossil File Log Editor</source>
<translation type="unfinished"></translation> <translation>Fossil Datei-Log-Editor</translation>
</message> </message>
<message> <message>
<source>Fossil Annotation Editor</source> <source>Fossil Annotation Editor</source>
<translation type="unfinished"></translation> <translation>Fossil Annotations-Editor</translation>
</message> </message>
<message> <message>
<source>Fossil Diff Editor</source> <source>Fossil Diff Editor</source>
<translation type="unfinished"></translation> <translation>Fossil Diff-Editor</translation>
</message> </message>
<message> <message>
<source>Fossil Commit Log Editor</source> <source>Fossil Commit Log Editor</source>
<translation type="unfinished"></translation> <translation>Fossil Commit-Log-Editor</translation>
</message> </message>
</context> </context>
<context> <context>

9
src/plugins/clangformat/clangformatglobalconfigwidget.cpp
View File

@@ -39,6 +39,7 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget(
m_overrideDefault = new QCheckBox(Tr::tr("Override .clang-format file")); m_overrideDefault = new QCheckBox(Tr::tr("Override .clang-format file"));
m_useGlobalSettings = new QCheckBox(Tr::tr("Use global settings")); m_useGlobalSettings = new QCheckBox(Tr::tr("Use global settings"));
m_useGlobalSettings->hide(); m_useGlobalSettings->hide();
m_overrideDefaultFile = ClangFormatSettings::instance().overrideDefaultFile();
using namespace Layouting; using namespace Layouting;
@@ -190,10 +191,12 @@ void ClangFormatGlobalConfigWidget::initOverrideCheckBox()
setTemporarilyReadOnly(); setTemporarilyReadOnly();
connect(m_overrideDefault, &QCheckBox::toggled, this, [this, setTemporarilyReadOnly](bool checked) { connect(m_overrideDefault, &QCheckBox::toggled, this, [this, setTemporarilyReadOnly](bool checked) {
if (m_project) if (m_project) {
m_project->setNamedSettings(Constants::OVERRIDE_FILE_ID, checked); m_project->setNamedSettings(Constants::OVERRIDE_FILE_ID, checked);
else } else {
ClangFormatSettings::instance().setOverrideDefaultFile(checked);
setTemporarilyReadOnly(); setTemporarilyReadOnly();
}
}); });
connect(m_codeStyle, connect(m_codeStyle,
@@ -212,12 +215,14 @@ void ClangFormatGlobalConfigWidget::apply()
settings.setMode( settings.setMode(
static_cast<ClangFormatSettings::Mode>(m_indentingOrFormatting->currentIndex())); static_cast<ClangFormatSettings::Mode>(m_indentingOrFormatting->currentIndex()));
settings.setOverrideDefaultFile(m_overrideDefault->isChecked()); settings.setOverrideDefaultFile(m_overrideDefault->isChecked());
m_overrideDefaultFile = m_overrideDefault->isChecked();
} }
settings.write(); settings.write();
} }
void ClangFormatGlobalConfigWidget::finish() void ClangFormatGlobalConfigWidget::finish()
{ {
ClangFormatSettings::instance().setOverrideDefaultFile(m_overrideDefaultFile);
m_codeStyle->currentPreferences()->setTemporarilyReadOnly( m_codeStyle->currentPreferences()->setTemporarilyReadOnly(
!ClangFormatSettings::instance().overrideDefaultFile()); !ClangFormatSettings::instance().overrideDefaultFile());
} }

1
src/plugins/clangformat/clangformatglobalconfigwidget.h
View File

@@ -43,6 +43,7 @@ private:
ProjectExplorer::Project *m_project; ProjectExplorer::Project *m_project;
TextEditor::ICodeStylePreferences *m_codeStyle; TextEditor::ICodeStylePreferences *m_codeStyle;
Utils::Guard m_ignoreChanges; Utils::Guard m_ignoreChanges;
bool m_overrideDefaultFile;
QLabel *m_projectHasClangFormat; QLabel *m_projectHasClangFormat;
QLabel *m_formattingModeLabel; QLabel *m_formattingModeLabel;

7
src/plugins/clangformat/clangformatutils.cpp
View File

@@ -214,12 +214,7 @@ bool getCurrentOverriddenSettings(const Utils::FilePath &filePath)
filePath); filePath);
return getProjectUseGlobalSettings(project) return getProjectUseGlobalSettings(project)
? !TextEditor::TextEditorSettings::codeStyle("Cpp") ? ClangFormatSettings::instance().overrideDefaultFile()
->currentPreferences()
->isTemporarilyReadOnly()
&& !TextEditor::TextEditorSettings::codeStyle("Cpp")
->currentPreferences()
->isAdditionalTabDisabled()
: getProjectOverriddenSettings(project); : getProjectOverriddenSettings(project);
} }

4
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -54,7 +54,6 @@
#include <utils/checkablemessagebox.h> #include <utils/checkablemessagebox.h>
#include <utils/commandline.h> #include <utils/commandline.h>
#include <utils/detailswidget.h> #include <utils/detailswidget.h>
#include <utils/headerviewstretcher.h>
#include <utils/infolabel.h> #include <utils/infolabel.h>
#include <utils/itemviews.h> #include <utils/itemviews.h>
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
@@ -68,6 +67,7 @@
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QDir> #include <QDir>
#include <QGridLayout> #include <QGridLayout>
#include <QHeaderView>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
@@ -250,7 +250,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
m_configView->setUniformRowHeights(true); m_configView->setUniformRowHeights(true);
m_configView->setSortingEnabled(true); m_configView->setSortingEnabled(true);
m_configView->sortByColumn(0, Qt::AscendingOrder); m_configView->sortByColumn(0, Qt::AscendingOrder);
(void) new HeaderViewStretcher(m_configView->header(), 0); m_configView->header()->setSectionResizeMode(QHeaderView::Stretch);
m_configView->setSelectionMode(QAbstractItemView::ExtendedSelection); m_configView->setSelectionMode(QAbstractItemView::ExtendedSelection);
m_configView->setSelectionBehavior(QAbstractItemView::SelectItems); m_configView->setSelectionBehavior(QAbstractItemView::SelectItems);
m_configView->setAlternatingRowColors(true); m_configView->setAlternatingRowColors(true);

9
src/shared/registryaccess/registryaccess.h
View File

@@ -20,10 +20,11 @@ enum AccessMode {
Registry64Mode = 0x4 // Corresponds to QSettings::Registry64Format (5.7) Registry64Mode = 0x4 // Corresponds to QSettings::Registry64Format (5.7)
}; };
static const char *debuggerApplicationFileC = "qtcdebugger"; constexpr const char debuggerApplicationFileC[] = "qtcdebugger";
static const WCHAR *debuggerRegistryKeyC = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"; constexpr const WCHAR debuggerRegistryKeyC[]
static const WCHAR *debuggerRegistryValueNameC = L"Debugger"; = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug";
static const WCHAR *autoRegistryValueNameC = L"Auto"; constexpr const WCHAR debuggerRegistryValueNameC[] = L"Debugger";
constexpr const WCHAR autoRegistryValueNameC[] = L"Auto";
static inline QString wCharToQString(const WCHAR *w) static inline QString wCharToQString(const WCHAR *w)
{ {

6
tests/system/shared/project.py
View File

@@ -125,8 +125,8 @@ def __handleBuildSystem__(buildSystem):
return buildSystem return buildSystem
def __createProjectHandleQtQuickSelection__(minimumQtVersion): def __createProjectHandleQtQuickSelection__(minimumQtVersion):
comboBox = waitForObject("{name='MinimumSupportedQtVersion' type='QComboBox' " comboBox = waitForObject("{name?='*QtVersion' type='QComboBox' visible='1'"
"visible='1' window=':New_ProjectExplorer::JsonWizard'}") " window=':New_ProjectExplorer::JsonWizard'}")
try: try:
selectFromCombo(comboBox, minimumQtVersion) selectFromCombo(comboBox, minimumQtVersion)
except: except:
@@ -505,7 +505,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False, ignoreVali
version = res.group("version") version = res.group("version")
else: else:
version = None version = None
if "Qt Quick" in templateName: if templateName == "Qt Quick Application":
result = set([Targets.DESKTOP_6_2_4]) result = set([Targets.DESKTOP_6_2_4])
elif 'Supported Platforms' in text: elif 'Supported Platforms' in text:
supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split("\n") supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split("\n")

13
tests/system/suite_general/tst_create_proj_wizard/test.py
View File

@@ -53,11 +53,18 @@ def main():
template = list(current.values())[0] template = list(current.values())[0]
with TestSection("Testing project template %s -> %s" % (category, template)): with TestSection("Testing project template %s -> %s" % (category, template)):
displayedPlatforms = __createProject__(category, template) displayedPlatforms = __createProject__(category, template)
if template == "Qt Quick Application": if template.startswith("Qt Quick Application"):
qtVersionsForQuick = ["6.2"] if "(compat)" in template: # QTCREATORBUG-29126
qtVersionsForQuick = ["Qt 5.14", "Qt 6.2"]
else:
qtVersionsForQuick = ["6.2"]
for counter, qtVersion in enumerate(qtVersionsForQuick): for counter, qtVersion in enumerate(qtVersionsForQuick):
def additionalFunc(displayedPlatforms, qtVersion): def additionalFunc(displayedPlatforms, qtVersion):
requiredQtVersion = __createProjectHandleQtQuickSelection__(qtVersion) requiredQtVersion = __createProjectHandleQtQuickSelection__(qtVersion)
if sys.version_info.major > 2:
requiredQtVersion = requiredQtVersion.removeprefix("Qt ")
else:
requiredQtVersion = requiredQtVersion.lstrip("Qt ")
__modifyAvailableTargets__(displayedPlatforms, requiredQtVersion, True) __modifyAvailableTargets__(displayedPlatforms, requiredQtVersion, True)
handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms, handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms,
additionalFunc, qtVersion) additionalFunc, qtVersion)
@@ -120,7 +127,7 @@ def handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms,
clickButton(waitForObject(":Next_QPushButton")) clickButton(waitForObject(":Next_QPushButton"))
if specialHandlingFunc: if specialHandlingFunc:
specialHandlingFunc(displayedPlatforms, *args) specialHandlingFunc(displayedPlatforms, *args)
if not ('Plain C' in template or 'Qt Quick' in template): if not ('Plain C' in template or template == 'Qt Quick Application'):
__createProjectHandleTranslationSelection__() __createProjectHandleTranslationSelection__()
verifyKitCheckboxes(kits, displayedPlatforms) verifyKitCheckboxes(kits, displayedPlatforms)
safeClickButton("Cancel") safeClickButton("Cancel")

20
tests/system/suite_tools/tst_codepasting/test.py
View File

@@ -72,7 +72,7 @@ def pasteFile(sourceFile, protocol):
try: try:
outputWindow = waitForObject(":Qt Creator_Core::OutputWindow") outputWindow = waitForObject(":Qt Creator_Core::OutputWindow")
waitFor("re.search('^https://', str(outputWindow.plainText)) is not None", 20000) waitFor("re.search('^https://', str(outputWindow.plainText)) is not None", 20000)
output = filter(lambda x: len(x), str(outputWindow.plainText).splitlines())[-1] output = list(filter(lambda x: len(x), str(outputWindow.plainText).splitlines()))[-1]
except: except:
output = "" output = ""
if closeHTTPStatusAndPasterDialog(protocol, ':Send to Codepaster_CodePaster::PasteView'): if closeHTTPStatusAndPasterDialog(protocol, ':Send to Codepaster_CodePaster::PasteView'):
@@ -107,7 +107,7 @@ def fetchSnippet(protocol, description, pasteId, skippedPasting):
pasteModel = waitForObject(":PasteSelectDialog.listWidget_QListWidget").model() pasteModel = waitForObject(":PasteSelectDialog.listWidget_QListWidget").model()
except: except:
closeHTTPStatusAndPasterDialog(protocol, ':PasteSelectDialog_CodePaster::PasteSelectDialog') closeHTTPStatusAndPasterDialog(protocol, ':PasteSelectDialog_CodePaster::PasteSelectDialog')
return -1 return invalidPasteId(protocol)
condition = "pasteModel.rowCount() > 1" condition = "pasteModel.rowCount() > 1"
if protocol == NAME_DPCOM: # no list support if protocol == NAME_DPCOM: # no list support
@@ -125,11 +125,12 @@ def fetchSnippet(protocol, description, pasteId, skippedPasting):
"window=':PasteSelectDialog_CodePaster::PasteSelectDialog'}") "window=':PasteSelectDialog_CodePaster::PasteSelectDialog'}")
waitFor("pasteModel.rowCount() == 1", 1000) waitFor("pasteModel.rowCount() == 1", 1000)
waitFor("pasteModel.rowCount() > 1", 20000) waitFor("pasteModel.rowCount() > 1", 20000)
if pasteId == -1: if pasteId == invalidPasteId(protocol):
try: for currentItem in dumpItems(pasteModel):
pasteLine = filter(lambda str:description in str, dumpItems(pasteModel))[0] if description in currentItem:
pasteId = pasteLine.split(" ", 1)[0] pasteId = currentItem.split(" ", 1)[0]
except: break
if pasteId == invalidPasteId(protocol):
test.fail("Could not find description line in list of pastes from %s" % protocol) test.fail("Could not find description line in list of pastes from %s" % protocol)
clickButton(waitForObject(":PasteSelectDialog.Cancel_QPushButton")) clickButton(waitForObject(":PasteSelectDialog.Cancel_QPushButton"))
return pasteId return pasteId
@@ -207,7 +208,7 @@ def main():
test.fatal(message) test.fatal(message)
continue continue
pasteId = fetchSnippet(protocol, description, pasteId, skippedPasting) pasteId = fetchSnippet(protocol, description, pasteId, skippedPasting)
if pasteId == -1: if pasteId == invalidPasteId(protocol):
continue continue
filenameCombo = waitForObject(":Qt Creator_FilenameQComboBox") filenameCombo = waitForObject(":Qt Creator_FilenameQComboBox")
waitFor("not filenameCombo.currentText.isEmpty()", 20000) waitFor("not filenameCombo.currentText.isEmpty()", 20000)
@@ -242,7 +243,8 @@ def main():
# QString QTextCursor::selectedText () const: # QString QTextCursor::selectedText () const:
# "Note: If the selection obtained from an editor spans a line break, the text will contain a # "Note: If the selection obtained from an editor spans a line break, the text will contain a
# Unicode U+2029 paragraph separator character instead of a newline \n character." # Unicode U+2029 paragraph separator character instead of a newline \n character."
selectedText = str(editor.textCursor().selectedText()).replace(unichr(0x2029), "\n") newParagraph = chr(0x2029) if sys.version_info.major > 2 else unichr(0x2029)
selectedText = str(editor.textCursor().selectedText()).replace(newParagraph, "\n")
invokeMenuItem("Tools", "Code Pasting", "Paste Snippet...") invokeMenuItem("Tools", "Code Pasting", "Paste Snippet...")
test.compare(waitForObject(":stackedWidget.plainTextEdit_QPlainTextEdit").plainText, test.compare(waitForObject(":stackedWidget.plainTextEdit_QPlainTextEdit").plainText,
selectedText, "Verify that dialog shows selected text from the editor") selectedText, "Verify that dialog shows selected text from the editor")

5
tests/system/suite_tools/tst_git_local/test.py
View File

@@ -65,7 +65,8 @@ def __clickCommit__(count):
# find commit # find commit
try: try:
# Commits are listed in reverse chronologic order, so we have to invert count # Commits are listed in reverse chronologic order, so we have to invert count
line = filter(lambda line: line.startswith("commit"), content.splitlines())[-count].strip() line = list(filter(lambda line: line.startswith("commit"),
content.splitlines()))[-count].strip()
commit = line.split(" ", 1)[1] commit = line.split(" ", 1)[1]
except: except:
test.fail("Could not find the %d. commit - leaving test" % count) test.fail("Could not find the %d. commit - leaving test" % count)
@@ -90,7 +91,7 @@ def __clickCommit__(count):
{"Committer: %s, %s" % (id, time): True}] {"Committer: %s, %s" % (id, time): True}]
for line, exp in zip(show.splitlines(), expected): for line, exp in zip(show.splitlines(), expected):
expLine = list(exp.keys())[0] expLine = list(exp.keys())[0]
isRegex = exp.values()[0] isRegex = list(exp.values())[0]
if isRegex: if isRegex:
test.verify(re.match(expLine, line), "Verifying commit header line '%s'" % line) test.verify(re.match(expLine, line), "Verifying commit header line '%s'" % line)
else: else: