From 09a0c0ec159dd8c95a1fb31418a144d50b16f78d Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Mon, 3 Jul 2023 16:45:17 +0200 Subject: [PATCH 001/101] Auto-setup: Forward CMAKE__STANDARD to conan/vcpkg Fixes: QTCREATORBUG-29292 Change-Id: Iee0b0639841d11fa14dcb57c1a4f9b4678aa0e2b Reviewed-by: Alessandro Portale Reviewed-by: --- .../3rdparty/package-manager/auto-setup.cmake | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake index 4689cc98049..60c21440449 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -16,6 +16,17 @@ if (QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP) endif() option(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP "Skip Qt Creator's package manager auto-setup" OFF) +macro(qtc_auto_setup_compiler_standard toolchainFile) + foreach(lang_var C CXX CUDA OBJC OBJCXX) + foreach(prop_var STANDARD STANDARD_REQUIRED EXTENSIONS) + if (CMAKE_${lang_var}_${prop_var}) + file(APPEND "${toolchainFile}" + "set(CMAKE_${lang_var}_${prop_var} ${CMAKE_${lang_var}_${prop_var}})\n") + endif() + endforeach() + endforeach() +endmacro() + # # conan # @@ -77,6 +88,8 @@ macro(qtc_auto_setup_conan) set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\") set(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\") ") + qtc_auto_setup_compiler_standard("${CMAKE_BINARY_DIR}/conan-dependencies/toolchain.cmake") + if (CMAKE_TOOLCHAIN_FILE) file(APPEND "${CMAKE_BINARY_DIR}/conan-dependencies/toolchain.cmake" "include(\"${CMAKE_TOOLCHAIN_FILE}\")\n") @@ -175,6 +188,8 @@ macro(qtc_auto_setup_vcpkg) set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\") set(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\") ") + qtc_auto_setup_compiler_standard("${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake") + if (CMAKE_TOOLCHAIN_FILE AND NOT CMAKE_TOOLCHAIN_FILE STREQUAL "${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake") file(APPEND "${CMAKE_BINARY_DIR}/vcpkg-dependencies/toolchain.cmake" From a841add9bfc3410f74f5d7b01fe04925acd0912b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 27 Jun 2023 13:59:14 +0200 Subject: [PATCH 002/101] German translation: Debugger, FakeVim, Fossil, Git, Help Change-Id: I77bd7d5e38510e60bf34087b32418ea9f47411f4 Reviewed-by: Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 72 ++++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 0930f3c8475..8fb6cf7a041 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -24570,23 +24570,23 @@ markers in the source code editor. The DAP process failed to start. Either the invoked program "%1" is missing, or you may have insufficient permissions to invoke the program. - + Der Start des DAP-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei "%1" oder die Berechtigungen sind nicht ausreichend. The DAP process crashed some time after starting successfully. - + Der DAP-Prozess ist einige Zeit nach dem Start abgestürzt. An error occurred when attempting to write to the DAP process. For example, the process may not be running, or it may have closed its input channel. - + Ein Fehler trat beim Versuch auf, zum DAP-Prozess zu schreiben. Wahrscheinlich läuft der Prozess nicht oder hat seinen Eingabekanal geschlossen. An error occurred when attempting to read from the DAP process. For example, the process may not be running. - + Ein Fehler trat beim Versuch auf, vom DAP-Prozess zu lesen. Wahrscheinlich läuft der Prozess nicht. An unknown error in the DAP process occurred. - + Im DAP-Prozess trat ein unbekannter Fehler auf. Adapter start failed @@ -24594,7 +24594,7 @@ markers in the source code editor. DAP I/O Error - + DAP Ein/Ausgabefehler Python Error @@ -24638,7 +24638,7 @@ markers in the source code editor. The system prevents loading of "%1", which is required for debugging. Make sure that your antivirus solution is up to date and if that does not work consider adding an exception for "%1". - + Das System verhindert das Laden von "%1", welches für das Debuggen erforderlich ist. Stellen Sie sicher, dass Ihr Virenschutzprogramm aktuell ist. Falls dies nicht hilft, ziehen Sie in Betracht, eine Ausnahme für "%1" hinzuzufügen. Module loaded: %1 @@ -24688,7 +24688,7 @@ Installieren Sie das Paket "Qt Debug Information Files" für diese Qt- Cannot read "%1": %2 - "%1" kann nicht gelesen werden: %2 + "%1" kann nicht gelesen werden: %2 Value %1 obtained from evaluating the condition of breakpoint %2, stopping. @@ -25597,35 +25597,35 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve Enable C++ debugger. - + C++-Debugger aktivieren. Try to determine need for C++ debugger. - + Versuche, die Notwendigkeit eines C++-Debuggers automatisch festzustellen. Enable QML debugger. - + QML-Debugger aktivieren. Try to determine need for QML debugger. - + Versuche, die Notwendigkeit eines QML-Debuggers automatisch festzustellen. Without additional startup commands. - + Ohne zusätzliche Kommandos beim Start. With additional startup commands. - + Mit zusätzlichen Kommandos beim Start. C++ debugger: - + C++-Debugger: QML debugger: - + QML-Debugger: Enable Debugging of Subprocesses @@ -25661,7 +25661,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve LLDB I/O Error - LLDB-Ein/Ausgabefehler + LLDB Ein/Ausgabefehler The LLDB process crashed some time after starting successfully. @@ -25669,11 +25669,11 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve An error occurred when attempting to write to the LLDB process. For example, the process may not be running, or it may have closed its input channel. - Ein Fehler trat beim Versuch zum LLDB-Prozess zu schreiben auf. Möglicherweise läuft der Prozess nicht oder hat seinen Eingabekanal geschlossen. + Ein Fehler trat beim Versuch auf, zum LLDB-Prozess zu schreiben. Wahrscheinlich läuft der Prozess nicht oder hat seinen Eingabekanal geschlossen. An error occurred when attempting to read from the Lldb process. For example, the process may not be running. - Ein Fehler trat beim Versuch vom Lldb-Prozess zu lesen auf. Möglicherweise läuft der Prozess nicht. + Ein Fehler trat beim Versuch auf, vom LLDB-Prozess zu lesen. Wahrscheinlich läuft der Prozess nicht. Use Local Symbol Cache @@ -25746,15 +25746,15 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve Generic - + Generisch GDB from PATH on Build Device - + GDB aus dem PATH des Build-Geräts LLDB from PATH on Build Device - + LLDB aus dem PATH des Build-Geräts Version: @@ -26719,11 +26719,11 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl Default array size: - + Standardgröße von Arrays: The number of array elements requested when expanding entries in the Locals and Expressions views. - + Die Anzahl der angeforderten Array-Elemente, wenn Einträge in "Lokale Variablen & Ausdrücke" ausgeklappt werden. Shows QML object tree in Locals and Expressions when connected and not stepping. @@ -28619,7 +28619,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins: Invalid regular expression. - + Ungültiger regulärer Ausdruck. "%1" %2 %3L, %4C written @@ -28809,7 +28809,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins: Triggers a Fossil version control operation. - + Führt eine Aktion des Fossil-Versionskontrollsystems aus. &Fossil @@ -29117,7 +29117,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins: For example: "https://[user[:pass]@]host[:port]/[path]". - + Zum Beispiel: "https://[user[:pass]@]host[:port]/[path]". Remember specified location as default @@ -29176,7 +29176,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins: Remove Directory - + Verzeichnis entfernen Generic Manager @@ -29184,11 +29184,11 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins: Project files list update failed. - + Aktualisieren der Dateiliste des Projekts fehlgeschlagen. Build %1 - + %1 erstellen @@ -29481,9 +29481,9 @@ Jetzt Commit ausführen? Cannot commit %n file(s). - - - + + Der Commit einer Datei ist fehlgeschlagen. + Der Commit von %n Dateien ist fehlgeschlagen. @@ -29838,7 +29838,7 @@ Jetzt Commit ausführen? Annotate the current line in the editor with Git "blame" output. - + Die aktuelle Zeile im Editor mit der Ausgabe von Git "blame" annotieren. Miscellaneous @@ -30600,7 +30600,7 @@ Teilmarkiert - Zustand nicht verändern. Pushes the selected commit and all commits it depends on. - + Push des ausgewählten Commits und aller Commits, die davon abhängen. Supported on Gerrit 2.15 and later. @@ -31888,7 +31888,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. Locates help topics, for example in the Qt documentation. - + Findet Hilfethemen, zum Beispiel in der Qt-Dokumentation. Help From 4e9b45dc5bd2cb625222f371be78304030dae959 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 27 Jun 2023 14:53:37 +0200 Subject: [PATCH 003/101] German translation: LanguageClient, ModelEditor, Perforce, PerfProfiler Change-Id: I0ae68cc3f2dff8044023d5a70d3b45f93543bc6b Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 64 ++++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 8fb6cf7a041..db5df298c99 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -33280,7 +33280,7 @@ Ablaufdatum: %3 Locates symbols in the current document, based on a language server. - + Findet Symbole im aktuellen Dokument, basierend auf einem Language Server. Symbols in Workspace @@ -33288,7 +33288,7 @@ Ablaufdatum: %3 Locates symbols in the language server workspace. - + Findet Symbole im Arbeitsbereich des Language Servers. Classes and Structs in Workspace @@ -33296,7 +33296,7 @@ Ablaufdatum: %3 Locates classes and structs in the language server workspace. - + Findet Klassen und Strukturen im Arbeitsbereich des Language Servers. Functions and Methods in Workspace @@ -33304,7 +33304,7 @@ Ablaufdatum: %3 Locates functions and methods in the language server workspace. - + Findet Funktionen und Methoden im Arbeitsbereich des Language Servers. Unexpectedly finished. Restarting in %1 seconds. @@ -33428,15 +33428,15 @@ Beispiel: *.cpp%1*.h shut down language client state - + abgeschaltet Language Server "%1" Initialization Error - + Fehler beim Initialisieren von Language Server "%1" Initialization error: %1. - + Fehler bei Initialisierung: %1. error @@ -33524,7 +33524,7 @@ Beispiel: *.cpp%1*.h Start typing to see replacements. - + Beginne zu tippen, um Ersetzungen zu sehen. Expand All @@ -33572,11 +33572,11 @@ Beispiel: *.cpp%1*.h <Select> - + <Auswählen> Language Server: - + Language Server: Log @@ -33604,7 +33604,7 @@ Beispiel: *.cpp%1*.h Reloads the call hierarchy for the symbol under cursor position. - + Lädt die Aufrufhierarchie für das Symbol unter der Einfügemarke neu. @@ -34960,8 +34960,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Drop Node - Eintrag fallen lassen - + Eintrag fallen lassen Select Custom Configuration Folder @@ -35297,7 +35296,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Created trace points for: %1 - Tracepoints für %1 erzeugt. + Tracepoints für %1 erzeugt Failed to run trace point script: %1 @@ -35514,7 +35513,8 @@ Useful if build directory is corrupted or when rebuilding with a newer version o The profiler did not produce any samples. Make sure that you are running a recent Linux kernel and that the "perf" utility is available and generates useful call graphs. You might find further explanations in the Application Output view. - + Der Profiler hat keine Samples geliefert. Stellen Sie sicher, dass Sie einen aktuellen Linux-Kernel verwenden und das Programm "perf" verfügbar ist und nutzbare Aufrufdiagramme erzeugt. +Weitere Erklärungen sind möglicherweise in "Ausgabe der Anwendung" zu finden. A performance analysis is still in progress. @@ -35534,7 +35534,7 @@ You might find further explanations in the Application Output view. Trace File (*.ptq) - + Trace-Datei (*.ptq) Show all addresses. @@ -35562,19 +35562,19 @@ You might find further explanations in the Application Output view. Failed to reset temporary trace file. - Eine temporäre Trace-Datei konnte nicht zurückgesetzt werden. + Temporäre Trace-Datei konnte nicht zurückgesetzt werden. Failed to flush temporary trace file. - Das Schreiben in eine temporäre Trace-Datei konnte nicht beendet werden. + Das Schreiben in eine temporäre Trace-Datei konnte nicht beendet werden. Cannot re-open temporary trace file. - Eine temporäre Trace-Datei konnte nicht neu geöffnet werden. + Temporäre Trace-Datei konnte nicht neu geöffnet werden. Read past end from temporary trace file. - Über das Ende der temporären Trace-Datei hinaus gelesen. + Über das Ende der temporären Trace-Datei hinaus gelesen. Thread started @@ -35590,7 +35590,7 @@ You might find further explanations in the Application Output view. Context switch - + Kontextwechsel Invalid @@ -35630,9 +35630,9 @@ You might find further explanations in the Application Output view. %n frame(s) - - - + + Ein Frame + %n Frames @@ -35665,7 +35665,7 @@ You might find further explanations in the Application Output view. context switch - + Kontextwechsel Duration @@ -35693,11 +35693,11 @@ You might find further explanations in the Application Output view. Invalid data format. The trace file's identification string is "%1". An acceptable trace file should have "%2". You cannot read trace files generated with older versions of %3. - + Ungültiges Datenformat. Die Identifizierungszeichenfolge in der Trace-Datei ist "%1". Eine gültige Trace-Datei sollte "%2" enthalten. Sie können keine Trace-Dateien lesen, die mit älteren Versionen von %3 erstellt wurden. Invalid data format. The trace file was written with data stream version %1. We can read at most version %2. Please use a newer version of Qt. - + Ungültiges Datenformat. Die Trace-Datei wurde mithilfe von Data Stream in der Version %1 geschrieben. Die höchste lesbare Version ist %2. Nutzen Sie bitte eine neuere Qt-Version. @@ -35708,7 +35708,7 @@ You might find further explanations in the Application Output view. Change number: - + Change-Nummer: P4 Pending Changes @@ -36001,19 +36001,19 @@ You might find further explanations in the Application Output view. Close Submit Editor - + Submit-Editor schließen Closing this editor will abort the submit. - + Wenn Sie diesen Editor schließen, wird der Submit abgebrochen. Cannot submit. - + Submit fehlgeschlagen. Cannot submit: %1. - + Submit fehlgeschlagen: %1. p4 submit failed: %1 From 980418652337e446d597f4e25a45533b1f3c69d2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 26 Jun 2023 16:06:47 +0200 Subject: [PATCH 004/101] German translation: Update Bookmarks, CMake, Core, CppEditor Change-Id: Ie866b45390e9e37e825ad339f8ca6688fd7c6f7e Reviewed-by: Christian Stenger Reviewed-by: --- share/qtcreator/translations/qtcreator_de.ts | 94 ++++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index db5df298c99..d8b9d4ace63 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -13916,7 +13916,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev Locates bookmarks. Filter by file name, by the text on the line of the bookmark, or by the bookmark's note text. - + Findet Lesezeichen. Filtert nach dem Dateinamen, dem Text in der Zeile des Lesezeichens oder seinem Anmerkungstext. Bookmark @@ -14255,7 +14255,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev Reload CMake Presets - + CMake Presets neu laden Build @@ -14275,11 +14275,11 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev Re-generates the kits that were created for CMake presets. All manual modifications to the CMake project settings will be lost. - + Erstellt die Kits neu, die für CMake Presets erstellt wurden. Alle manuellen Änderungen an den CMake-Projekteinstellungen gehen dabei verloren. Reload - Neu laden + Neu laden Build File is not supported for generator "%1" @@ -14439,11 +14439,11 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev Stage for installation - + Für die Installation bereitstellen Staging directory: - + Bereitstellungsverzeichnis: Enable automatic provisioning updates: @@ -14484,7 +14484,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev Stage at %2 for %3 Stage (for installation) at <staging_dir> for <installation_dir> - + In %2 für %3 bereitstellen CMake Build @@ -14587,7 +14587,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev Ask before reloading CMake Presets - + Vor dem Neuladen von CMake Presets nachfragen Show subfolders inside source group folders @@ -14659,7 +14659,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev Running in %1: %2. - + Führe in %1 aus: %2. <No CMake Tool available> @@ -14823,7 +14823,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev Build CMake Target - + CMake-Ziel erstellen Builds a target of any open CMake project. @@ -14831,11 +14831,11 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev Open CMake Target - + CMake-Ziel öffnen Locates the definition of a target of any open CMake project. - + Findet die Definition eines Ziels in allen geöffneten CMake-Projekten. The source directory %1 is not reachable by the CMake executable %2. @@ -14887,7 +14887,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev <Generated Files> - + <Generierte Dateien> Unexpected source directory "%1", expected "%2". This can be correct in some situations, for example when importing a standalone Qt test, but usually this is an error. Import the build anyway? @@ -14899,7 +14899,7 @@ Zum Beispiel bewirkt die Angabe "Revision: 15" dass der Branch auf Rev CMake Presets - + CMake Presets Target type: @@ -15587,7 +15587,7 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der Override .clang-format file - + .clang-format-Datei außer Kraft setzen Use global settings @@ -15615,7 +15615,7 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der When this option is enabled, ClangFormat will use a user-specified configuration from the widget below, instead of the project .clang-format file. You can customize the formatting options for your code by adjusting the settings in the widget. Note that any changes made there will only affect the current configuration, and will not modify the project .clang-format file. - + Wenn diese Einstellung aktiviert ist, wird statt der .clang-format-Datei des Projekts die benutzerdefinierte Einstellung unten benutzt. Beachten Sie, dass die unten durchgeführten Einstellungen nur die aktuelle Konfiguration beeinflussen und die .clang-format-Datei des Projekts nicht verändert wird. ClangFormat @@ -15798,7 +15798,7 @@ Setzen Sie erst eine gültige ausführbare Datei. Prefer .clang-tidy file, if present - + .clang-tidy-Datei bevorzugen, sofern vorhanden Build the project before analysis @@ -15916,7 +15916,7 @@ Setzen Sie erst eine gültige ausführbare Datei. Set a valid %1 executable. - + Wählen Sie eine gültige ausführbare Datei für %1. Project "%1" is not a C/C++ project. @@ -17239,7 +17239,7 @@ Trotzdem fortfahren? Toolbar style: - + Werkzeugleisten-Stil: Text codec for tools: @@ -17251,11 +17251,11 @@ Trotzdem fortfahren? Compact - + Kompakt Relaxed - + Entspannt Interface @@ -18565,7 +18565,7 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden Locates files from a custom set of directories. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well. - + Findet Dateien aus vom Benutzer gewählten Pfaden. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen. Add... @@ -18700,15 +18700,15 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche Create Directory - + Verzeichnis erzeugen Create and Open File "%1" - + Erzeuge und öffne Datei "%1" Create Directory "%1" - + Erzeuge Verzeichnis "%1" Include hidden files @@ -19040,11 +19040,11 @@ Möchten Sie es beenden? Triggers a web search with the selected search engine. - + Führt eine Suche im Internet mit der ausgewählten Suchmaschine aus. Triggers a search in the Qt bug tracker. - + Führt eine Suche im Qt-Bugtracker aus. <html><body style="color:#909090; font-size:14px"><div align='center'><div style="font-size:20px">Open a document</div><table><tr><td><hr/><div style="margin-top: 5px">&bull; File > Open File or Project (%1)</div><div style="margin-top: 5px">&bull; File > Recent Files</div><div style="margin-top: 5px">&bull; Tools > Locate (%2) and</div><div style="margin-left: 1em">- type to open file from any open project</div>%4%5<div style="margin-left: 1em">- type <code>%3&lt;space&gt;&lt;filename&gt;</code> to open file from file system</div><div style="margin-left: 1em">- select one of the other filters for jumping to a location</div><div style="margin-top: 5px">&bull; Drag and drop files here</div></td></tr></table></div></body></html> @@ -19642,7 +19642,7 @@ Möchten Sie sie jetzt auschecken? MiB - + MiB Enable crash reporting @@ -19879,7 +19879,7 @@ provided they were unmodified before the refactoring. Locates files from a global file system index (Spotlight, Locate, Everything). Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well. - + Findet Dateien aus einem globalen Dateisystemindex (Spotlight, Locate, Everything). Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen. Case sensitive: @@ -19919,15 +19919,15 @@ provided they were unmodified before the refactoring. The evaluation was interrupted. - + Die Auswertung wurde unterbrochen. Engine reinitialized properly. - + Die Engine hat sich korrekt neu initialisiert. Engine did not reinitialize properly. - + Die Engine hat sich nicht korrekt neu initialisiert. Copy to clipboard: %1 @@ -20008,11 +20008,11 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern. Show All - + Alle anzeigen Back - Zurück + Zurück Text Encoding @@ -20468,11 +20468,11 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern. Switches to an open document. - + Wechselt zu einem offenen Dokument. Markdown Editor - + Markdown-Editor @@ -20687,7 +20687,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern. Add Member Function "%1" - + Memberfunktion "%1" hinzufügen Extract Constant as Function Parameter @@ -21701,7 +21701,7 @@ z.B. name = "m_test_foo_": Locates C++ symbols in the current document. - + Findet C++-Symbole im aktuellen Dokument. C++ Classes @@ -21709,7 +21709,7 @@ z.B. name = "m_test_foo_": Locates C++ classes in any open project. - + Findet C++-Klassen in allen offenen Projekten. C++ Functions @@ -21717,7 +21717,7 @@ z.B. name = "m_test_foo_": Locates C++ functions in any open project. - + Findet C++-Funktionen in allen offenen Projekten. All Included C/C++ Files @@ -21730,7 +21730,7 @@ z.B. name = "m_test_foo_": Locates C++ classes, enums, functions and type aliases in any open project. - + Findet C++-Klassen, -Aufzählungen, -Funktionen und -Typaliase in allen offenen Projekten. C++ Symbols @@ -21798,15 +21798,15 @@ z.B. name = "m_test_foo_": Use Built-in Only - + Nur integriertes Backend benutzen Use Clangd Only - + Nur Clangd benutzen Try Both - + Beide versuchen Interpret ambiguous headers as C headers @@ -21854,7 +21854,7 @@ z.B. name = "m_test_foo_": <p>Which C/C++ backend to use when switching between header and source file.<p>The clangd implementation has more capabilities, but also has some bugs not present in the built-in variant.<p>When "Try Both" is selected, clangd will be employed only if the built-in variant does not find anything. - + <p>Bestimmt, welches C/C++-Backend zum Wechseln zwischen Header- und Quelldatei benutzt wird.<p>Die Clangd-Implementation hat mehr Fähigkeiten, aber auch einige Fehler, die nicht in der integrierten Variante vorhanden sind.<p>Wenn "Beide versuchen" ausgewählt ist, wird Clangd nur benutzt, wenn die integrierte Variant nichts findet. Number of worker threads used by clangd. Background indexing also uses this many worker threads. @@ -21910,7 +21910,7 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun Header/source switch mode: - + Modus für das Wechseln zwischen Header- und Quelldatei: Worker thread count: @@ -22262,7 +22262,7 @@ Flags: %3 Locates files that are included by C++ files of any open project. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well. - + Findet alle Dateien die von allen C++-Dateien aller Projekte eingebunden werden. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen. From fbd8bbff47aec863da1745821dc56c68b0b03e13 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 29 Jun 2023 09:48:14 +0200 Subject: [PATCH 005/101] German translation: Python, qmt, ScxmlEditor, TextEditor Change-Id: I8f3561f69c0df09b01cef7c08e61b297d599076a Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 55 ++++++++++---------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index d8b9d4ace63..eeda616f0b6 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -42001,23 +42001,23 @@ fails because Clang does not understand the target architecture. %1 (Windowed) <python display name> (Windowed) - + %1 (mit Fenster) Python interpreter: - + Python-Interpreter: New Python Virtual Environment Directory - + Neues Verzeichnis für virtuelle Umgebung Virtual environment directory: - + Verzeichnis für virtuelle Umgebung: Create - + Erstellen Removing Python @@ -42041,7 +42041,7 @@ fails because Clang does not understand the target architecture. Install Python Packages - + Python-Pakete installieren Running "%1" to install %2. @@ -42049,15 +42049,15 @@ fails because Clang does not understand the target architecture. The installation of "%1" was canceled by timeout. - + Die Installation von "%1" wurde wegen Zeitüberschreitung abgebrochen. The installation of "%1" was canceled by the user. - + Die Installation von "%1" wurde vom Benutzer abgebrochen. Installing "%1" failed with exit code %2. - + Die Installation von "%1" ist mit dem Rückgabewert %2 fehlgeschlagen. Run PySide6 project tool @@ -42109,7 +42109,7 @@ fails because Clang does not understand the target architecture. Create Virtual Environment - + Virtuelle Umgebung erstellen Manage Python Interpreters @@ -42133,27 +42133,27 @@ fails because Clang does not understand the target architecture. Create Python venv - + Python venv erstellen "data" of a Python wizard page expects a map with "items" containing a list of objects. - + "data" einer Python-Assistenzseite erwartet eine Zuordnung mit "items", die eine Liste aus Objekten enthält. An item of Python wizard page data expects a "trKey" field containing the UI visible string for that Python version and a "value" field containing an object with a "PySideVersion" field used for import statements in the Python files. - + Ein Eintrag in den "items" im Feld "data" einer Python-Assistenzseite erwartet ein Feld "trKey", das den Anzeigenamen für diese Python-Version enthält, und ein Feld "value", das ein Objekt mit einem Feld "PySideVersion" enthält, das für import-Anweisungen in den Python-Dateien benutzt wird. PySide version: - PySide-Version: + PySide-Version: Create new virtual environment - + Neue virtuelle Umgebung erstellen Path to virtual environment: - + Pfad zur virtuellen Umgebung: @@ -48172,7 +48172,7 @@ Beschreibung: %4 Magnifier Tool - + Vergrößerungswerkzeug Navigator (Ctrl+E) @@ -50126,7 +50126,7 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun Failed to format: %1. - + Formatieren fehlgeschlagen: %1. Cannot read file "%1": %2. @@ -50138,7 +50138,7 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun Error in text formatting: %1 - + Fehler bei der Formatierung: %1 Could not format file %1. @@ -51159,7 +51159,7 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen. Open Call Hierarchy - + Aufrufhierarchie öffnen Move the View a Page Up and Keep the Cursor Position @@ -51861,11 +51861,11 @@ Wird benutzt um die Funktion zu markieren, die ein gesuchtes Symbol benutzt. Concept - + Konzept Name of a concept. - + Name eines Konzepts. Namespace @@ -52436,7 +52436,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten. (type name READ name WRITE setName NOTIFY nameChanged FINAL) group:'C++' trigger:'Q_PROPERTY' - + (type name READ name WRITE setName NOTIFY nameChanged FINAL) with targets @@ -52518,15 +52518,15 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten. Show Preview - + Vorschau anzeigen Show Editor - + Editor anzeigen Swap Views - + Ansichten tauschen @@ -56013,8 +56013,7 @@ should a repository require SSH-authentication (see documentation on SSH and the Canvas Diagrams - Canvasdiagramme - + Canvasdiagramme Item From fbdbaa8a84b2809c714d3b8e68429452716309a9 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 29 Jun 2023 11:25:12 +0200 Subject: [PATCH 006/101] German translation: Utils, Valgrind, VcsBase Change-Id: Ib0fa7a241450c9ceabef746b83b4df533e60875c Reviewed-by: Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 66 ++++++++++++-------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index eeda616f0b6..e9bf90ca6c8 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -52923,15 +52923,15 @@ Die Trace-Daten sind verloren. List of comma separated wildcard filters. - + Kommaseparierte Liste von Platzhalter-Filtern. Files with file name or full file path matching any filter are included. - + Dateien werden eingeschlossen, wenn ihr Name oder vollständiger Pfad einem der Filter entspricht. Files with file name or full file path matching any filter are excluded. - + Dateien werden ausgeschlossen, wenn ihr Name oder vollständiger Pfad einem der Filter entspricht. Local @@ -53168,7 +53168,7 @@ Die Trace-Daten sind verloren. The program "%1" could not be found. - + Das Programm "%1" wurde nicht gefunden. Process Not Responding @@ -53248,7 +53248,7 @@ Die Trace-Daten sind verloren. Cannot set permissions on temporary directory "%1": %2 - + Die Berechtigungen für das temporäre Verzeichnis "%1" konnten nicht gesetzt werden: %2 Cannot create socket "%1": %2 @@ -53879,7 +53879,7 @@ in "%2" aus. No clangd executable specified. - + Es wurde keine ausführbare Datei für Clangd angegeben. Failed to retrieve clangd version: Unexpected clangd output. @@ -53891,23 +53891,23 @@ in "%2" aus. Failed to open temporary script file. - + Die temporäre Script-Datei konnte nicht geöffnet werden. Failed to start terminal process: "%1". - + Der Terminalprozess konnte nicht gestartet werden: "%1". Failed copying file. - + Fehler beim Kopieren. Failed reading file. - + Fehler beim Lesen der Datei. Failed writing file. - + Fehler beim Schreiben der Datei. @@ -54042,15 +54042,15 @@ in "%2" aus. Valgrind Generic Settings - + Generische Einstellungen für Valgrind Memcheck Memory Analysis Options - + Einstellungen für die Memcheck Speicheranalyse Callgrind Profiling Options - + Einstellungen für den Callgrind Profiler Valgrind @@ -54074,7 +54074,7 @@ in "%2" aus. Extra Memcheck arguments: - + Zusätzliche Memcheck-Argumente: Track origins of uninitialized memory @@ -54082,7 +54082,7 @@ in "%2" aus. Extra Callgrind arguments: - + Zusätzliche Callgrind-Argumente: Limits the amount of results the profiler gives you. A lower limit will likely increase performance. @@ -54102,7 +54102,7 @@ in "%2" aus. Valgrind arguments: - + Valgrind-Argumente Enable cache simulation @@ -54117,7 +54117,14 @@ With cache simulation, further event counters are enabled: <li>Data read accesses ("Dr") and related cache misses ("D1mr"/"D2mr").</li> <li>Data write accesses ("Dw") and related cache misses ("D1mw"/"D2mw").</li></ul> </p> - + <p>Führt eine vollständige Cache-Simulation durch.</p> +<p>Standardmäßig werden nur Instruction Read-Zugriffe gezählt ("Ir").</p> +<p> +Mit Cache-Simulation werden weitere Ereigniszähler aktiviert: +<ul><li>Cache-Misses bei Instruction Reads ("I1mr"/"I2mr").</li> +<li>Data Read-Zugriffe ("Dr") und entsprechende Cache-Misses ("D1mr"/"D2mr").</li> +<li>Data Write-Zugriffe ("Dw") und entsprechende Cache-Misses ("D1mw"/"D2mw").</li></ul> +</p> Enable branch prediction simulation @@ -54130,7 +54137,13 @@ With cache simulation, further event counters are enabled: "Bc"/"Bcm").</li> <li>Executed indirect jumps and related misses of the jump address predictor ( "Bi"/"Bim").)</li></ul> - + https://de.wikipedia.org/wiki/Sprungvorhersage + <p>Führt Branch Prediction-Simulation durch.</p> +<p>Aktiviert weitere Ereigniszähler:</p> +<ul><li>Anzahl der ausgeführten bedingten Verzweigungen und entsprechende Sprungvorhersagefehler ( +"Bc"/"Bcm").</li> +<li>Ausgeführte indirekte Sprünge und entsprechende Fehler der Sprungadressenvorhersage ( +"Bi"/"Bim").)</li></ul> Collect system call time @@ -54230,7 +54243,7 @@ With cache simulation, further event counters are enabled: Failed opening temp file... - + Temporäre Datei konnte nicht geöffnet werden... Function: @@ -54723,7 +54736,8 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch Valgrind executable "%1" not found or not executable. Check settings or ensure Valgrind is installed and available in PATH. - + Die ausführbare Valgrind-Datei "%1" wurde nicht gefunden oder ist nicht ausführbar. +Überprüfen Sie die Einstellungen und stellen Sie sicher, dass Valgrind installiert und im PATH verfügbar ist. Analyzing finished. @@ -54761,7 +54775,7 @@ Check settings or ensure Valgrind is installed and available in PATH. %1 (Called: %2; Incl. Cost: %3) - + %1 (Aufgerufen: %2; Inkl. Kosten: %3) New @@ -55455,19 +55469,19 @@ Check settings or ensure Valgrind is installed and available in PATH. Close Commit Editor - + Commit-Editor schließen Closing this editor will abort the commit. - + Wenn Sie diesen Editor schließen, wird der Commit abgebrochen. Cannot commit. - + Commit fehlgeschlagen. Cannot commit: %1. - + Commit fehlgeschlagen: %1. Save before %1? From 3b4a8526370dfab45d42cb0c6f0ed96143d669f2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 29 Jun 2023 10:19:33 +0200 Subject: [PATCH 007/101] German translation: QmlJS(Editor|Tools|Preview|Profiler) Change-Id: I2643131f416f0c8cd60766882faba07a337e5f25 Reviewed-by: Christian Stenger Reviewed-by: --- share/qtcreator/translations/qtcreator_de.ts | 92 ++++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index e9bf90ca6c8..b80d8c2d181 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -44598,23 +44598,23 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de Use customized static analyzer - + Angepasste statische Analyse benutzen Enabled - Aktiviert + Aktiviert Disabled for non Qt Quick UI - + Nur für Qt Quick UI Message - + Nachricht Enabled checks can be disabled for non Qt Quick UI files, but disabled checks cannot get explicitly enabled for non Qt Quick UI files. - + Überprüfungen können für alle Dateien oder nur für Qt Quick UI-Dateien aktiviert werden. Es ist nicht möglich, Überprüfungen nur für Qt Quick UI-Dateien zu deaktivieren. Automatic Formatting on File Save @@ -44630,11 +44630,11 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de Static Analyzer - + Statische Analyse Reset to Default - Auf Vorgabe zurücksetzen + Auf Vorgabe zurücksetzen Enable auto format on file save @@ -44717,7 +44717,7 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de Locates QML functions in any open project. - + Findet QML-Funktionen in allen offenen Projekten. Code Style @@ -44741,7 +44741,7 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de Other - Andere + Andere &Line length: @@ -44757,15 +44757,15 @@ Sie können eine Annotation "// @uri My.Module.Uri" hinzufügen, um de QtC::QmlPreview QML Preview - QML-Vorschau + QML-Vorschau Preview changes to QML code live in your application. - + Zeigt Änderungen an QML-Code in Echtzeit in Ihrer Anwendung. Preview File - Datei in Vorschau anzeigen + Datei in Vorschau anzeigen @@ -45059,7 +45059,7 @@ Wollen Sie die Daten vorher speichern? Quick3D - + Quick3D Failed to replay QML events from stash file. @@ -45530,135 +45530,135 @@ Speichern fehlgeschlagen. Render Frame - + Frame rendern Synchronize Frame - + Frame synchronisieren Prepare Frame - + Frame vorbereiten Mesh Load - + Mesh laden Custom Mesh Load - + Angepasstes Mesh laden Texture Load - + Textur laden Generate Shader - + Shader generieren Load Shader - + Shader laden Particle Update - + Partikel aktualisieren Render Call - + Renderaufruf Render Pass - + Renderdurchgang Event Data - + Ereignisdaten Mesh Memory consumption - + Mesh Speicherbedarf Texture Memory consumption - + Textur Speicherbedarf Mesh Unload - + Mesh entladen Custom Mesh Unload - + Angepasstes Mesh entladen Texture Unload - + Textur entladen Unknown Unload Message %1 - + Unbekannte Entlade-Nachricht %1 Description - Beschreibung + Beschreibung Count - Anzahl + Anzahl Draw Calls - + Draw-Aufrufe Render Passes - + Renderdurchgänge Total Memory Usage - + Gesamter Speicherverbrauch Primitives - + Primitive Instances - + Instanzen Frame - Frame + Frame Frame Delta - + Frame Delta View3D - + View3D All - Alle + Alle None - Keine + Keine Quick3D Frame - + Quick3D Frame Select View3D - + View3D auswählen Compare Frame - + Frame vergleichen From 3f912c01fbc569ef30e9dc58a81f64f181d8d24f Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 28 Jun 2023 11:33:49 +0200 Subject: [PATCH 008/101] Doc/Extending: Update "getting and building" page qmake files were still referenced. Do not focus on building Qt Creator, we ship a development package nowadays which is preferred. Change-Id: If209f48c0fcf4f8fbe87ecaddae826ad3a63c209 Reviewed-by: Leena Miettinen Reviewed-by: --- doc/qtcreatordev/src/creating-plugins.qdoc | 2 +- .../src/getting-and-building.qdoc | 70 +++++++++++-------- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/doc/qtcreatordev/src/creating-plugins.qdoc b/doc/qtcreatordev/src/creating-plugins.qdoc index 6a83c6d9bf4..2e26dd282c8 100644 --- a/doc/qtcreatordev/src/creating-plugins.qdoc +++ b/doc/qtcreatordev/src/creating-plugins.qdoc @@ -31,7 +31,7 @@ \section1 Basics \list - \li \l{Getting and Building Qt Creator} + \li \l{Getting Qt and Qt Creator} \li \l{Creating Your First Plugin} \li \l{Plugin Meta Data} \li \l{Plugin Life Cycle} diff --git a/doc/qtcreatordev/src/getting-and-building.qdoc b/doc/qtcreatordev/src/getting-and-building.qdoc index 24895359571..7079e9f0558 100644 --- a/doc/qtcreatordev/src/getting-and-building.qdoc +++ b/doc/qtcreatordev/src/getting-and-building.qdoc @@ -3,53 +3,67 @@ /*! \page getting-and-building.html - \title Getting and Building Qt Creator + \title Getting Qt and Qt Creator - \code - TODO: This should be extended. - * Windows specific hassle, see README in \QC sources - \endcode + To create and build a \QC plugin, you need a compatible version of Qt, + and either a \QC package (released or snapshot) or your own \QC build. There are several reasons why you might want to do your own build of \QC, like using the most current development version and being able to tweak \QC - at one or the other place. It is also necessary if you want to create your - own \QC plugin. + at one or the other place. But it is not strictly necessary for creating + plugins. The \QC packages contain a \uicontrol {Plugin Development} + component that enables plugin development with the \QC contained in the + package. \section1 Getting Qt - Prebuilt \QC packages usually use the latest stable release of Qt. You can - see the exact minimum requirement at the top of \QC's \c {qtcreator.pro}. - (You can find the current version in our source repository here: - \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/qtcreator.pro#n4}.) + Prebuilt \QC packages usually use the latest stable release of Qt. + See the exact Qt version that a \QC package was built with in its + \uicontrol {About \QC} dialog. + + The minimum requirement for building \QC is stated in the + \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/about/README.md} + {README.md} and near the top of the + \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/cmake/QtCreatorAPI.cmake} + {cmake/QtCreatorAPI.cmake} file in the sources. You can get prebuilt Qt packages from \l{https://download.qt.io}{Qt Downloads}. If you want to use Qt as provided by your Linux distribution, you need to make sure that all Qt development packages and private header packages are also installed. - \section1 Getting and Building \QC + \section1 Getting \QC + + \section2 Installing a Prebuilt Package + + The prebuilt \QC packages contain a \uicontrol {Plugin Development} + component that contains the CMake files, headers and other files + that you need to build a plugin. It is not installed by default, so make + sure to select the component when installing \QC. + + When developing your plugin, point the \c {CMAKE_PREFIX_PATH} to the + installation location of \QC, or the \QC app on macOS. + + Get prebuilt packages either from the + \l{https://download.qt.io/official_releases/online_installers/} + {Qt online installer}, or a standalone \QC installer either for a + \l{https://download.qt.io/official_releases/qtcreator/} + {released \QC version} or a \l{https://download.qt.io/snapshots/qtcreator/} + {development snapshot}. + + \section2 Building \QC You can get the \QC sources for a specific version either by using one of - the released source bundles, or from the Git repository + the released source bundles or by cloning the sources from the Git repository \l{https://code.qt.io/cgit/qt-creator/qt-creator.git}. If you intend to contribute to \QC itself, you should use the repository from our Gerrit review tool as described in: \l{https://wiki.qt.io/Setting_up_Gerrit}{Setting up Gerrit}. - We strongly encourage you to do out-of-source builds of \QC (also called - shadow-builds). + Refer to the + \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/about/README.md} + {README.md} included in the sources for details on building \QC. - After you put the \QC sources somewhere (lets call the path - \c {}) - you build it on Linux and Mac with - - \code - cd /.. - mkdir qtcreator-build - cd qtcreator-build - /bin/qmake -r - make - \endcode - - or the corresponding commands on Windows systems. + When developing your plugin, point the \c {CMAKE_PREFIX_PATH} to the + build location of \QC. */ From f23103467ab318532b4fee6ffc01b94cc2d88388 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Tue, 4 Jul 2023 10:31:33 +0200 Subject: [PATCH 009/101] Terminal: Remove unnecessary echo Fixes: QTCREATORBUG-29354 Change-Id: Ie6ddd127fecef3f48e56ca17335b21afaab31365 Reviewed-by: Eike Ziller --- src/libs/utils/externalterminalprocessimpl.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libs/utils/externalterminalprocessimpl.cpp b/src/libs/utils/externalterminalprocessimpl.cpp index 2a316a22831..b69cf798337 100644 --- a/src/libs/utils/externalterminalprocessimpl.cpp +++ b/src/libs/utils/externalterminalprocessimpl.cpp @@ -24,9 +24,8 @@ ProcessStubCreator::ProcessStubCreator(TerminalInterface *interface) static const QLatin1String TerminalAppScript{R"( tell application "Terminal" activate - set newTab to do script "echo Preparing terminal..." + set newTab to do script "%1 && exit" set win to (the id of window 1 where its tab 1 = newTab) as text - do script "%1 && exit" in newTab repeat until ((count of processes of newTab) = 0) delay 0.1 end repeat From c73266783875e49dbb4722ff673119c8213f993e Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 4 Jul 2023 18:16:41 +0200 Subject: [PATCH 010/101] QmakeProjectManager: Prevent infinite loop on ABI change Fixes: QTCREATORBUG-29204 Change-Id: I6f4e4fa96f6c48dc83f0e5baf2205421b9ff67ca Reviewed-by: Eike Ziller Reviewed-by: --- src/plugins/qmakeprojectmanager/qmakestep.cpp | 17 +++++++++++++---- src/plugins/qmakeprojectmanager/qmakestep.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 27e29e497e8..93e13f71f0c 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -510,9 +510,9 @@ QWidget *QMakeStep::createConfigWidget() widget, [this] { qtVersionChanged(); }); connect(abisListWidget, &QListWidget::itemChanged, this, [this] { - abisChanged(); - if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration()) - BuildManager::buildLists({bc->cleanSteps()}); + if (m_ignoreChanges.isLocked()) + return; + handleAbiWidgetChange(); }); connect(widget, &QObject::destroyed, this, [this] { @@ -654,6 +654,8 @@ void QMakeStep::askForRebuild(const QString &title) void QMakeStep::updateAbiWidgets() { + const GuardLocker locker(m_ignoreChanges); + if (!abisLabel) return; @@ -702,7 +704,7 @@ void QMakeStep::updateAbiWidgets() item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); item->setCheckState(selectedAbis.contains(param) ? Qt::Checked : Qt::Unchecked); } - abisChanged(); + handleAbiWidgetChange(); } } @@ -711,6 +713,13 @@ void QMakeStep::updateEffectiveQMakeCall() m_effectiveCall->setValue(effectiveQMakeCall()); } +void QMakeStep::handleAbiWidgetChange() +{ + abisChanged(); + if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration()) + BuildManager::buildLists({bc->cleanSteps()}); +} + void QMakeStep::recompileMessageBoxFinished(int button) { if (button == QMessageBox::Yes) { diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index f72c48d4612..d977eedd904 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -155,6 +155,7 @@ private: void updateAbiWidgets(); void updateEffectiveQMakeCall(); + void handleAbiWidgetChange(); Utils::CommandLine m_qmakeCommand; Utils::CommandLine m_makeCommand; From 1dbeb17841ee221467ad466a2281ba23dc2e1b3b Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 5 Jul 2023 08:51:36 +0200 Subject: [PATCH 011/101] Editor: Fix painting overlay selection The border around the selection overlaps the line rect, so in order to correctly repaint the selection when scrolling we need to widen the prefiltering of painted selection. Change-Id: I953749571e3e9ae412bf05f47ab3c4c3bfb8861e Reviewed-by: Christian Stenger --- src/plugins/texteditor/texteditoroverlay.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp index ca15ff256bf..c5155008926 100644 --- a/src/plugins/texteditor/texteditoroverlay.cpp +++ b/src/plugins/texteditor/texteditoroverlay.cpp @@ -340,8 +340,8 @@ void TextEditorOverlay::paint(QPainter *painter, const QRect &clip) : m_editor->blockCount() - 1; auto overlapsClip = [&](const OverlaySelection &selection) { - return selection.m_cursor_end.blockNumber() >= firstBlockNumber - && selection.m_cursor_begin.blockNumber() <= lastBlockNumber; + return selection.m_cursor_end.blockNumber() + 1 >= firstBlockNumber + && selection.m_cursor_begin.blockNumber() - 1 <= lastBlockNumber; }; for (int i = m_selections.size() - 1; i >= 0; --i) { From ef8dcbdfa80998cb43f3d699aed44a59b98b8333 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 4 Jul 2023 16:20:12 +0200 Subject: [PATCH 012/101] StudioWelcome: fix signedness warning Change-Id: Iffa90513ce0cbb0df5480a59bdf371c1d6da5a00 Reviewed-by: Reviewed-by: Tim Jenssen --- src/plugins/studiowelcome/stylemodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/studiowelcome/stylemodel.cpp b/src/plugins/studiowelcome/stylemodel.cpp index 520129f20d4..8b36151a9e2 100644 --- a/src/plugins/studiowelcome/stylemodel.cpp +++ b/src/plugins/studiowelcome/stylemodel.cpp @@ -63,7 +63,7 @@ int StyleModel::filteredIndex(int actualIndex) if (actualIndex < 0) return actualIndex; - QTC_ASSERT(actualIndex < m_items.size(), return -1); + QTC_ASSERT(actualIndex < Utils::ssize(m_items), return -1); QStandardItem *item = m_items.at(actualIndex); // TODO: perhaps should add this kind of find to utils/algorithm.h From 72c401d9ce18e7f40d9a24bd5da37480a5f2b2d1 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 5 Jul 2023 11:29:24 +0200 Subject: [PATCH 013/101] Doc: Add a disclaimer about disabling plugins Change-Id: Ib75b4e88c24ad13693ef02e76de74ba23dcb9e04 Reviewed-by: Eike Ziller --- .../howto/creator-only/creator-how-to-enable-plugins.qdoc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc index 72592cdca5a..f47ccc30c34 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc @@ -16,7 +16,10 @@ on are also enabled. You can also disable plugins that you do not use, to streamline \QC. - By default, all the plugins that depend on the plugin are also disabled. + If you disable a plugin, \QC asks you to disable all plugins that + depend on it. This might lead to some features not working properly. + Further, the plugins are not automatically enabled if you enable the + first plugin again. To enable and disable plugins: From 707d3dd7aa9bce7bebade047d4bc459f1eb09b3b Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 4 Jul 2023 16:48:52 +0200 Subject: [PATCH 014/101] Doc: Move sidebar view docs into separate topics - Link the topics from "Show and hide sidebars" - Hide "Working in Edit Mode" from QDS because the Edit mode is hidden by default there - Fix links to the new topics and remove links to "Browsing Project Contents" Task-number: QTCREATORBUG-29361 Change-Id: Ia9ae6474bf0925a76f9ccee693369d2460b9266f Reviewed-by: Mats Honkamaa --- doc/qtcreator/src/editors/creator-coding.qdoc | 7 +- .../editors/creator-editors-writing-code.qdoc | 15 +- .../creator-only/creator-clang-codemodel.qdoc | 10 +- .../creator-coding-edit-mode.qdoc | 46 +----- .../creator-only/creator-language-server.qdoc | 8 +- .../creator-semantic-highlighting.qdoc | 8 +- doc/qtcreator/src/qtcreator-toc.qdoc | 6 - .../creator-file-system-view.qdoc | 16 +- ...creator-how-to-show-and-hide-sidebars.qdoc | 9 ++ .../creator-reference-sidebar-views.qdoc | 134 ++++++++++++++++ .../creator-open-documents-view.qdoc | 23 +-- .../user-interface/creator-projects-view.qdoc | 20 ++- .../src/user-interface/creator-ui.qdoc | 3 +- .../src/user-interface/creator-views.qdoc | 148 ------------------ .../src/qtdesignstudio-toc.qdoc | 6 +- .../qtdesignstudio-3d-loader-3d.qdoc | 5 +- .../src/views/qtquick-designer.qdoc | 6 +- .../src/views/qtquick-text-editor.qdoc | 3 +- 18 files changed, 222 insertions(+), 251 deletions(-) rename doc/qtcreator/src/editors/{ => creator-only}/creator-coding-edit-mode.qdoc (92%) create mode 100644 doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc delete mode 100644 doc/qtcreator/src/user-interface/creator-views.qdoc diff --git a/doc/qtcreator/src/editors/creator-coding.qdoc b/doc/qtcreator/src/editors/creator-coding.qdoc index 77cfc2e000d..ce095492875 100644 --- a/doc/qtcreator/src/editors/creator-coding.qdoc +++ b/doc/qtcreator/src/editors/creator-coding.qdoc @@ -26,11 +26,16 @@ \li \l{Writing Code} + \if defined(qtdesignstudio) + The \l{Code} view offers services, such as semantic highlighting, + syntax checking, code completion, code indentation, and in-line + error indicators while you are typing. + \else Writing, editing, and navigating in source code are core tasks in application development. Therefore, the code editor is one of the key components of \QC. You can use the code editor in the \uicontrol Edit mode. - + \endif \li \l{Finding} Use the incremental and advanced search to search from currently diff --git a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc index 05853ad0d3d..a5f5fc89c3f 100644 --- a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc +++ b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc @@ -1,4 +1,4 @@ -// Copyright (C) 2018 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only // ********************************************************************** @@ -8,9 +8,13 @@ // ********************************************************************** /*! - \previouspage creator-coding.html \page creator-editor-functions.html + \previouspage creator-coding.html + \if defined(qtdesignstudio) + \nextpage creator-output-panes.html + \else \nextpage creator-coding-navigating.html + \endif \title Writing Code @@ -19,14 +23,14 @@ in-line error indicators while you are typing. \list - + \if defined(qtcreator) \li \l{Working in Edit Mode} You can use the editor toolbar to navigate between open files and symbols in use. You can also split the view to work on several files simultaneously, add bookmarks, and move between symbol definitions and declarations. - + \endif \li \l{Semantic Highlighting} \QC enables you to write well formatted code by highlighting @@ -75,8 +79,6 @@ keyboard sequence as a macro. You can then play the macro to repeat the sequence. You can save the latest macro and assign a keyboard shortcut for running it or run it from the locator. - \endif - \endlist \section1 Related Topics @@ -88,7 +90,6 @@ You can use a diff editor to compare two versions of a file and view the differences side-by-side in the \uicontrol Edit mode. - \if defined(qtcreator) \li \l{Parsing C++ Files with the Clang Code Model} The Clang code model offers some of the same services as the 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 45ca8060925..f9ce09b9551 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc @@ -28,9 +28,8 @@ {locator}, \l{Moving to Symbol Definition or Declaration} {following symbols}, and so on - \li Inspecting code by using the \l{Browsing Project Contents} - {class browser}, the \l{Viewing Defined Types and Symbols} - {outline}, and so on + \li Inspecting code by using the \l{Class View}{class browser}, the + \l{Outline}{outline}, and so on \li Diagnostics @@ -154,9 +153,8 @@ specify that the projects in the session should be managed by a single clangd process. - The document outline in the \l{Viewing Defined Types and Symbols} - {Outline} view is backed by clangd's document symbol support, which - makes the results more reliable than before. + The document outline in the \l{Outline} view is backed by clangd's document + symbol support, which makes the results more reliable than before. To specify settings for clangd: diff --git a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc similarity index 92% rename from doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc rename to doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc index c5042fd7553..c17613f38f5 100644 --- a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc @@ -1,33 +1,20 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - /*! \previouspage creator-editor-functions.html \page creator-coding-navigating.html - \if defined(qtdesignstudio) - \nextpage creator-views.html - \else \nextpage creator-highlighting.html - \endif \title Working in Edit Mode - This section describes how to use the \uicontrol Edit mode. For more - information about using the sidebar, see \l{Browsing Project Contents}. + You can write code in the \uicontrol Edit mode. \section1 Using the Editor Toolbar - The editor toolbar is located at the top of the editor view. The editor - toolbar is context sensitive and shows items relevant to the file currently - open in the editor. + The editor toolbar is located at the top of the editor view. It is context + sensitive and shows items relevant to the file currently open in the editor. - \if defined(qtcreator) \image qtcreator-editortoolbar-symbols.webp {Edit mode toolbar} To add more space around the toolbar items, select \uicontrol Edit > @@ -35,9 +22,6 @@ then select \uicontrol Relaxed in the \uicontrol {Toolbar style} field. \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences} - \else - \image studio-edit-mode.png - \endif \section2 Navigating Between Open Files and Symbols @@ -72,10 +56,9 @@ \l{Searching with the Locator}{locator}. Enter the line number and column number in the locator, separated by a colon (:). - \note You can also use the \l{Browsing Project Contents}{sidebars} to + \note You can also use the \l{Show and hide sidebars}{sidebars} to move around in \QC. - \if defined(qtcreator) \section2 Selecting Parse Context Code might be interpreted differently in different contexts. A file can be @@ -104,7 +87,6 @@ To reload the file with the selected encoding, select \uicontrol {Reload with Encoding}. To save the file with the new encoding, select \uicontrol {Save with Encoding}. - \endif \section2 Selecting Line Ending Style @@ -120,7 +102,7 @@ To set the line endings to use for a project, select \uicontrol Projects > \uicontrol {Project Settings} > \uicontrol Editor. - \if defined(qtcreator) + For more information, see \l {Specifying Editor Settings}. \section2 Managing Language Servers @@ -132,7 +114,6 @@ \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 @@ -246,12 +227,7 @@ \endlist To view the note, move the mouse pointer over the bookmark or open the - \uicontrol Bookmarks view - \if defined(qtcreator) - in the \l{Show and hide sidebars}{sidebar}. - \else - in the \l{Managing Workspaces}{workspace}. - \endif + \uicontrol Bookmarks view in the \l{Show and hide sidebars}{sidebar}. \section2 Navigating Bookmarks @@ -338,7 +314,6 @@ \uicontrol {Open Corresponding Header/Source in Next Split}. You can also press \key F4 or \key {Ctrl+E,F4}, respectively. - \if defined(qtcreator) \section1 Reparsing Externally Changed Files If source files are modified from outside \QC, the opened files will be @@ -363,13 +338,4 @@ \QC underlines semantic errors in olive in the C++ code editor. To check the correct paths for includes that are not resolved or that are resolved to the wrong file, select \uicontrol {Project Parts} > \uicontrol {Header Paths}. - - \else - \section1 Related Topics - - \list - \li \l{Browsing Project Contents} - \li \l{Viewing Output} - \endlist - \endif */ 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 43697c0f6d7..4957e981d33 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc @@ -29,11 +29,9 @@ {locator} or \l{Moving to Symbol Definition or Declaration} {moving to the symbol definition} \li Inspecting code by viewing the document outline in the - \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} + \l{Outline} view or in the \uicontrol Symbols list on the + \l{Using the Editor Toolbar}{editor toolbar} + \li \l{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 diff --git a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc index 3ef73484ab3..37bb884664b 100644 --- a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc +++ b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc @@ -1,9 +1,13 @@ -// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! - \previouspage creator-coding-navigating.html \page creator-highlighting.html + \if defined(qtdesignstudio) + \previouspage creator-output-panes.html + \else + \previouspage creator-coding-navigating.html + \endif \nextpage creator-checking-code-syntax.html \title Semantic Highlighting diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index eb8ced88e3b..fafc9841779 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -19,12 +19,6 @@ \li \l{IDE Overview} \li \l{User Interface} \list - \li \l{Browsing Project Contents} - \list - \li \l{Projects} - \li \l{File System} - \li \l{Open Documents} - \endlist \li \l{Viewing Output} \endlist \li \l{Configuring Qt Creator} diff --git a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc index b7eddea19a0..793fa213daa 100644 --- a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc @@ -3,22 +3,30 @@ /*! \page creator-file-system-view.html + \if defined(qtdesignstudio) \previouspage creator-projects-view.html \nextpage creator-open-documents-view.html + \else + \previouspage creator-how-to-show-and-hide-sidebars.html + \nextpage creator-output-panes.html + \endif + + \ingroup creator-reference-sidebar-views + \ingroup studio-views \title File System - The \uicontrol {File System} view shows all the files in the file system. + \brief Shows all the files in the current directory. + \if defined(qtcreator) \note Usually, \l{Searching with the Locator}{searching with the locator} is the fastest way to find a particular project, file, class, or function, or almost anything else in your project. Use the \e {file system (f)} filter to open files from anywhere in the file system. - \if defined(qtdesignstudio) - \image qtcreator-filesystem-view-design.png {File System view} - \else \image qtcreator-filesystem-view.webp {File System view in the sidebar} + \else + \image qtcreator-filesystem-view-design.png {File System view} \endif To move to the root directory of the file system, select \uicontrol Computer diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc index d1a07de2cef..71105caadf9 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc @@ -31,4 +31,13 @@ \li To close a sidebar view, click \inlineimage icons/splitbutton_closetop.png (\uicontrol {Close}). \endlist + + \section1 Sidebar views + + Manage projects and files in the following views: + + \annotatedlist creator-reference-sidebar-views + + In some views, right-clicking opens a context menu that has functions + for managing the objects listed in the view. */ diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc new file mode 100644 index 00000000000..90c26db8d2c --- /dev/null +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc @@ -0,0 +1,134 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \page creator-outline-view.html + \previouspage creator-how-to-show-and-hide-sidebars.html + \nextpage creator-output-panes.html + \ingroup creator-reference-sidebar-views + + \title Outline + + \brief Shows an overview of defined types and other symbols, as well as + their properties and hierarchy in a source file. + + To move the code for types and symbols around in the source file, drag + them in the outline. + + \image qtcreator-outline-view.png {Outline view} + + \list + \li To see a complete list of all bindings, select + \inlineimage icons/filtericon.png + (\uicontrol {Filter Tree}) > \uicontrol {Show All Bindings}. + \li To sort types or symbols alphabetically, select + \inlineimage icons/sort_alphabetically.png + (\uicontrol {Sort Alphabetically}). + \li To stop the synchronization with the type or symbol selected in the + editor, deselect \inlineimage icons/linkicon.png + (\uicontrol {Synchronize with Editor}). + \endlist +*/ + +/*! + \page creator-class-view.html + \previouspage creator-how-to-show-and-hide-sidebars.html + \nextpage creator-output-panes.html + \ingroup creator-reference-sidebar-views + + \title Class View + + \brief Shows the class hierarchy of the currently open projects. + + \image qtcreator-class-view.png {Class View} + + \list + \li To organize the view by subprojects, click + \inlineimage icons/qtcreator-show-subprojects.png + (\uicontrol {Show Subprojects}). + \li To visit all parts of a namespace, double-click on the + namespace item multiple times. + \endlist +*/ + +/*! + \page creator-call-hierarchy-view.html + \previouspage creator-how-to-show-and-hide-sidebars.html + \nextpage creator-output-panes.html + \ingroup creator-reference-sidebar-views + + \title Call Hierarchy + + \brief 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} +*/ + +/*! + \page creator-type-hierarchy.html + \previouspage creator-how-to-show-and-hide-sidebars.html + \nextpage creator-output-panes.html + \ingroup creator-reference-sidebar-views + + \title Type Hierarchy + + \brief Shows the base classes and derived classes of a class. + + To view type hierarchy of a class: + + \list 1 + \li Right-click a class in the code editor. + \li Select \uicontrol {Open Type Hierarchy} or press \key {Ctrl+Shift+T}. + \endlist + + \image qtcreator-type-hierarchy-view.png {Type Hierarchy view} + + To navigate in the type hierarchy: + + \list + \li Double-click a class or select it. + \li Select \uicontrol {Open Type Hierarchy} in the context menu. + \endlist + + The view highlights the previous class. + + The definition of the selected class opens in the code editor. You + can also select \uicontrol {Open in Editor} in the context menu to open + it. +*/ + +/*! + \page creator-include-hierarchy-view.html + \previouspage creator-how-to-show-and-hide-sidebars.html + \nextpage creator-output-panes.html + \ingroup creator-reference-sidebar-views + + \title Include Hierarchy + + \brief Shows the files that the current file includes and those that include + the current file. + + To view the include hierarchy of a file: + + \list 1 + \li Right-click a file in the editor. + \li Select \uicontrol {Open Include Hierarchy} + or press \key {Ctrl+Shift+I}. + \endlist + + \image qtcreator-include-hierarchy-view.png {Include Hierarchy view} + + To keep the view synchronized with the file currently open in the editor, + select \inlineimage icons/linkicon.png + (\uicontrol {Synchronize with Editor}). +*/ diff --git a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc index 47b6b3dd00e..c4e3d9e5692 100644 --- a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc @@ -1,20 +1,25 @@ -// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page creator-open-documents-view.html - \previouspage creator-file-system-view.html + \if defined(qtdesignstudio) + \previouspage creator-file-system-view.html \nextpage studio-content-library.html \else + \previouspage creator-how-to-show-and-hide-sidebars.html \nextpage creator-output-panes.html \endif + \ingroup creator-reference-sidebar-views + \ingroup studio-views + \title Open Documents - The \uicontrol {Open Documents} view displays a list of open documents. + \brief Shows currently open files. - \image qtcreator-open-documents-view.png "Open Documents view" + \image qtcreator-open-documents-view.png {Open Documents view} You can use the context menu to apply some of the functions also available in the \uicontrol File menu and in the \l {File System Context Menu} @@ -25,17 +30,17 @@ \list \li Copy the full path of the file or just the filename to the clipboard. - \li Pin files to ensure they stay at the top of the list and are not - closed when you select \uicontrol {Close All}. + \li Pin files to the top of the list to keep them open when you + select \uicontrol {Close All}. \endlist - \section1 Specifying Settings for Opening Files + \section1 Setting Preferences for Opening Files - To specify settings for opening files and handling open files, select + To set preferences for opening files and handling open files, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment > \uicontrol System: - \image qtcreator-options-environment-system.png "Environment preferences System tab" + \image qtcreator-options-environment-system.png {System tab in Environment preferences} \list \li In the \uicontrol {When files are externally modified} field, diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc index ef356c81cf4..1c3534afd13 100644 --- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc @@ -5,28 +5,32 @@ \page creator-projects-view.html \if defined(qtdesignstudio) \previouspage qtquick-curve-editor.html - \else - \previouspage creator-views.html - \endif \nextpage creator-file-system-view.html + \else + \previouspage creator-how-to-show-and-hide-sidebars.html + \nextpage creator-output-panes.html + \endif + + \ingroup creator-reference-sidebar-views + \ingroup studio-views \title Projects - The \uicontrol Projects view displays projects in a project tree. + \brief Shows a list of projects in a project tree. + \if defined(qtcreator) The project tree has a list of all projects open in the current \l{Managing Sessions}{session}. For each project, the tree visualizes the build system structure of the project and lists all files that are part of the project. + \image qtcreator-projects-view-edit.png {Projects view in the sidebar} + \note Usually, \l{Searching with the Locator}{searching with the locator} is the fastest way to find a particular project, file, class, or function, or almost anything else in your project. - - \if defined(qtdesignstudio) - \image qtcreator-projects-view-design.png {Projects view} \else - \image qtcreator-projects-view-edit.png {Projects view in the sidebar} + \image qtcreator-projects-view-design.png {Projects view} \endif You can use the project tree in the following ways: diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc index 29fe61bb26b..a6fd8c45576 100644 --- a/doc/qtcreator/src/user-interface/creator-ui.qdoc +++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc @@ -82,7 +82,6 @@ For information about new features and bug fixes in each \QC release, select \uicontrol Help > \uicontrol {Change Log}. - \sa {Show and hide sidebars}, {Browsing Project Contents} \sa {Use the UI}{How-to: Use the UI} \else @@ -145,7 +144,7 @@ /*! \page creator-output-panes.html \if defined(qtdesignstudio) - \previouspage creator-views.html + \previouspage creator-editor-functions.html \nextpage creator-highlighting.html \else \previouspage creator-open-documents-view.html diff --git a/doc/qtcreator/src/user-interface/creator-views.qdoc b/doc/qtcreator/src/user-interface/creator-views.qdoc deleted file mode 100644 index 673e902736d..00000000000 --- a/doc/qtcreator/src/user-interface/creator-views.qdoc +++ /dev/null @@ -1,148 +0,0 @@ -// Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \page creator-views.html - \if defined(qtdesignstudio) - \previouspage creator-coding-navigating.html - \nextpage creator-output-panes.html - \else - \previouspage creator-quick-tour.html - \nextpage creator-projects-view.html - \endif - - \title Browsing Project Contents - - \if defined(qtdesignstudio) - You can organize \QDS views as \l {Managing Workspaces}{workspaces}. - \else - You can organize \QC views in \l {Show and hide sidebars}{sidebars} or as - workspaces, depending on the \l{Switch between modes}{mode} you are working - in. Only views that are relevant to a mode are available in it. - \endif - - \note Usually, \l{Searching with the Locator}{searching with the locator} - is the fastest way to find a particular project, file, class, or function, - or almost anything else in your project. - - Manage projects and files in the following views: - - \list - \li \l Projects shows a list of projects open in the current - session and the project files needed by the build system. - \li \l{File System} shows all files in the currently selected - directory. - \li \l{Open Documents} shows currently open files. - \li \l{Using Bookmarks}{Bookmarks} shows all bookmarks for the current - session. - \li \l{Working with Branches}{Git Branches} shows the local and remote - branches for the project in the Git version control system. - \li \l{Viewing Defined Types and Symbols}{Outline} shows an overview of - defined types and other symbols, as well as their properties and - hierarchy in a source file. - \endlist - - \if defined(qtcreator) - The following views display additional information about C++ code: - - \list - \li \l{Viewing the Class Hierarchy}{Class View} shows the class - hierarchy of the currently open projects. - \li \l{Running Autotests}{Tests} lists autotests and Qt Quick - tests in the project. - \li \l{Viewing Type Hierarchy}{Type Hierarchy} shows the base - classes of a class. - \li \l{Viewing Include Hierarchy}{Include Hierarchy} shows the - files that the current file includes and those that include - the current file. - \endlist - \else - For more information about views that are only available when editing QML - files in the \uicontrol Design mode, see \l{Design Views}. - \endif - - The following sections describe the additional options in a particular view. - - In some views, right-clicking opens a context menu that has functions - for managing the objects listed in the view. - - \section1 Viewing Defined Types and Symbols - - The \uicontrol Outline view shows an overview of defined types and other - symbols, as well as their properties and hierarchy in a source file. - You can move the code for types and symbols around in the source file - by dragging and dropping them in the outline. - - \image qtcreator-outline-view.png "Outline view" - - \list - \li To see a complete list of all bindings, select - \inlineimage icons/filtericon.png - (\uicontrol {Filter Tree}) > \uicontrol {Show All Bindings}. - \li To sort types or symbols alphabetically, select - \inlineimage icons/sort_alphabetically.png - (\uicontrol {Sort Alphabetically}). - \li To stop the synchronization with the type or symbol selected in the - editor, deselect \inlineimage icons/linkicon.png - (\uicontrol {Synchronize with Editor}). - \endlist - - \if defined(qtcreator) - \section1 Viewing the Class Hierarchy - - The \uicontrol {Class View} shows the class hierarchy of the currently - open projects. - - \image qtcreator-class-view.png "Class View" - - To organize the view by subprojects, click - \inlineimage icons/qtcreator-show-subprojects.png - (\uicontrol {Show Subprojects}). - - 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 - class in the code editor and select \uicontrol {Open Type Hierarchy} or - press \key {Ctrl+Shift+T}. - - \image qtcreator-type-hierarchy-view.png "Type Hierarchy view" - - To navigate in the type hierarchy, double-click a class or select it, - and then select \uicontrol {Open Type Hierarchy} in the context menu. - The view highlights the previous class. - - The definition of the selected class opens in the code editor. You - can also select \uicontrol {Open in Editor} in the context menu to open - it. - - \section1 Viewing Include Hierarchy - - To view the files that the current file includes and those that include - the current file, right-click in the editor and select - \uicontrol {Open Include Hierarchy} or press \key {Ctrl+Shift+I}. - - \image qtcreator-include-hierarchy-view.png "Include Hierarchy view" - - To keep the view synchronized with the file currently open in the editor, - select \inlineimage icons/linkicon.png - (\uicontrol {Synchronize with Editor}). - \endif -*/ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index 41dffb76f25..0f9f485b8c7 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -200,11 +200,7 @@ \list \li \l{Writing Code} \list - \li \l{Working in Edit Mode} - \list - \li \l{Browsing Project Contents} - \li \l{Viewing Output} - \endlist + \li \l{Viewing Output} \li \l{Semantic Highlighting} \li \l{Checking Code Syntax} \li \l{Completing Code} diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-loader-3d.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-loader-3d.qdoc index 6e94c566da8..209b1eba911 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-loader-3d.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-loader-3d.qdoc @@ -47,9 +47,8 @@ \section2 Source Component The \uicontrol {Source Component} property defines the component for - \uicontrol Loader3D to instantiate. Currently, the - \uicontrol {Source component} needs to be defined in code using the - \l {Working in Edit Mode}{Edit} mode or the \l {Code} view. + \uicontrol Loader3D to instantiate. Currently, you need to define the + \uicontrol {Source component} in the \l {Code} view. \section2 Asynchronous diff --git a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc index 7750e2e4792..f4c230d917c 100644 --- a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc @@ -110,7 +110,7 @@ \li \l{Code} \li Provides a code editor for viewing and modifying the code generated by the visual editors. - \li \l {Working in Edit Mode} + \li \l {Writing Code} \row \li \l Projects \li Shows a list of open projects and the files they contain. @@ -177,12 +177,12 @@ That is, returns the focus to the last location in the last file it was on. \li \key Alt+< (\key Opt+Cmd+< on \macos) - \li \l{Navigating Between Open Files and Symbols} + \li \row \li \inlineimage icons/next.png \li \uicontrol {Go Forward}: moves a step forward in your location history. \li \key Alt+> (\key Opt+Cmd+> on \macos) - \li \l{Navigating Between Open Files and Symbols} + \li \row \li \inlineimage icons/close.png \li \uicontrol {Close Document}: closes the current file. diff --git a/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc index 75e84be9c45..3b07e787ecc 100644 --- a/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc @@ -21,8 +21,7 @@ \uicontrol Edit > \uicontrol {Find/Replace} > \uicontrol {Find/Replace}. You can also select \key Ctrl + \key {F}. - You can use a subset of the functions available in the - \l{Writing Code}{Edit mode}: + The view offers the following features: \list \li \l{Semantic Highlighting} From cdea404957975f8ed354eb814d1abd170096feeb Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 4 Jul 2023 10:36:24 +0200 Subject: [PATCH 015/101] SquishTests: Fix welcome page test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the view is populated and sorted it gets its items one by one. If multiple matches for opening an example are possible we may end up using the wrong one which in turn makes the test error out. So, wait for an expected amount of items. Change-Id: If6f6abfa757ede33311a8e617ab7d570df1240a4 Reviewed-by: Robert Löhning --- tests/system/suite_WELP/tst_WELP03/test.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index 3b60d15a2e2..7c672464eb3 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -18,10 +18,18 @@ def handlePackagingMessageBoxes(): except: break -def openExample(examplesLineEdit, input, exampleRegex, exampleName): + +def openExample(examplesLineEdit, input, exampleRegex, exampleName, waitForChildCount=0): replaceEditorContent(examplesLineEdit, input) listView = waitForObject("{type='QListView' unnamed='1' visible='1' " "window=':Qt Creator_Core::Internal::MainWindow'}") + if waitForChildCount > 0: + + def childCount(view): + return len(__childrenOfType__(view, 'QModelIndex')) + + waitFor("childCount(listView) == waitForChildCount", 3000) + waitFor('findExampleOrTutorial(listView, exampleRegex) is not None', 3000) example = findExampleOrTutorial(listView, exampleRegex, True) if test.verify(example is not None, "Verifying: Example (%s) is shown." % exampleName): @@ -100,7 +108,7 @@ def main(): removePackagingDirectory(os.path.dirname(p)) examplesLineEdit = waitForObject(search %(expect[1][0], expect[1][1])) example = openExample(examplesLineEdit, "address book", "(0000 )?Address Book.*", - "Address Book Example") + "Address Book Example", 3) if example is not None: # close second example application test.verify(checkIfObjectExists("{column='0' container=':Qt Creator_Utils::NavigationTreeView'" From b4dd53f9fe6b5ff6ed0ca0c6fd398399f5249460 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 5 Jul 2023 13:56:51 +0200 Subject: [PATCH 016/101] Vcpkg: Fix the plugin string translation context It is supposed to start with "QtC::" Change-Id: I9cb0b34bc7c42b4cfb58753ceb36db532e2236db Reviewed-by: Eike Ziller --- share/qtcreator/translations/qtcreator_de.ts | 2 +- src/plugins/vcpkg/vcpkgtr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index b80d8c2d181..b5877dc1af9 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -58251,7 +58251,7 @@ Are you sure you want to remove the material? - Vcpkg + QtC::Vcpkg Search package... diff --git a/src/plugins/vcpkg/vcpkgtr.h b/src/plugins/vcpkg/vcpkgtr.h index 0914ce6444d..90e107bb7d4 100644 --- a/src/plugins/vcpkg/vcpkgtr.h +++ b/src/plugins/vcpkg/vcpkgtr.h @@ -9,7 +9,7 @@ namespace Vcpkg { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Vcpkg) + Q_DECLARE_TR_FUNCTIONS(QtC::Vcpkg) }; } // namespace Vcpkg From 6235d9b8cc8ed860a19aa3adaea4357eb183c4b8 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 5 Jul 2023 14:53:50 +0200 Subject: [PATCH 017/101] CMakePM: use string form for architecture / toolset preset fields Documentation mentions: "Each may be either a string or an object" and "If no strategy field is given, or if the field uses the string form rather than the object form, the behavior is the same as 'set'" Task-number: QTCREATORBUG-28693 Change-Id: Idd8cdffb94e9a943e0b133a63c628d9d8d54eb20 Reviewed-by: Alessandro Portale --- .../cmakeprojectmanager/presetsparser.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/presetsparser.cpp b/src/plugins/cmakeprojectmanager/presetsparser.cpp index f3be87f7ea8..f3f92f76fd5 100644 --- a/src/plugins/cmakeprojectmanager/presetsparser.cpp +++ b/src/plugins/cmakeprojectmanager/presetsparser.cpp @@ -296,6 +296,15 @@ bool parseConfigurePresets(const QJsonValue &jsonValue, if (strategy == "external") preset.architecture->strategy = PresetsDetails::ValueStrategyPair::Strategy::external; + } else { + preset.architecture->strategy = PresetsDetails::ValueStrategyPair::Strategy::set; + } + } else { + const QString value = object.value("architecture").toString(); + if (!value.isEmpty()) { + preset.architecture = PresetsDetails::ValueStrategyPair(); + preset.architecture->value = value; + preset.architecture->strategy = PresetsDetails::ValueStrategyPair::Strategy::set; } } @@ -311,6 +320,15 @@ bool parseConfigurePresets(const QJsonValue &jsonValue, preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::set; if (strategy == "external") preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::external; + } else { + preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::set; + } + } else { + const QString value = object.value("toolset").toString(); + if (!value.isEmpty()) { + preset.toolset = PresetsDetails::ValueStrategyPair(); + preset.toolset->value = value; + preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::set; } } From a0f0f9c69b1da09a8b6419ee8e9036e4978d5dbf Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 30 Jun 2023 13:06:51 +0200 Subject: [PATCH 018/101] Doc: Update tutorials - Use \ingroup creator-tutorials to group tutorials - Use \annotatedlist to automatically generate tables that list tutorials - Add \brief commands to add descriptions to the tables - Remove some leftover descriptions from the Qt Quick Application wizard template docs - Fix references to UI text - Write "you" instead of "we" - Use curly braces to define alt text for images - Some language fixes Task-number: QTCREATORBUG-28996 Change-Id: I4b611319b6867cae11d613e0a4d075923cdb037e Reviewed-by: Eike Ziller Reviewed-by: --- .../creator-only/creator-tutorials.qdoc | 34 ++------- doc/qtcreator/src/qtcreator-toc.qdoc | 5 -- .../creator-mobile-app-tutorial.qdoc | 47 ++++++------- .../creator-only/qtquick-app-tutorial.qdoc | 70 +++++++++---------- ...uick-tutorial-create-empty-project.qdocinc | 28 +++----- .../src/widgets/qtdesigner-app-tutorial.qdoc | 58 ++++++++------- 6 files changed, 98 insertions(+), 144 deletions(-) diff --git a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc index e75d8fb4a5d..40b0ffc1d0a 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc @@ -1,40 +1,18 @@ -// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - /*! \previouspage creator-build-example-application.html \page creator-tutorials.html - \nextpage {Creating a Qt Quick Application} + \nextpage creator-project-managing.html \title Tutorials \image front-help.png - You can use \QC to create applications for several platforms by using - several technologies. The tutorials in this manual explain how to create - some basic applications. - - \list - - \li \l{Creating a Qt Quick Application} - - Learn how to create a Qt Quick application. - - \li \l{Creating a Qt Widget Based Application} - - Learn how to create a Qt widget based application for the desktop. - - \li \l{Creating a Mobile Application} - - Learn how to create a Qt Quick application using Qt Quick Controls - for Android and iOS devices. - - \endlist + You can use \QC to create applications for several \l{Supported Platforms} + {platforms} by using several \l{User Interfaces}{UI technologies}. Follow + the tutorials to learn how to create some basic Qt applications. + \annotatedlist creator-tutorials */ diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index fafc9841779..3a6e5c2ccc3 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -24,11 +24,6 @@ \li \l{Configuring Qt Creator} \li \l{Building and Running an Example} \li \l{Tutorials} - \list - \li \l{Creating a Qt Quick Application} - \li \l{Creating a Qt Widget Based Application} - \li \l{Creating a Mobile Application} - \endlist \endlist \li \l{Managing Projects} \list diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc index 7ca4ea2a017..6d617292b76 100644 --- a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc @@ -1,25 +1,23 @@ -// Copyright (C) 2022 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - /*! - \previouspage creator-writing-program.html \example accelbubble + \previouspage creator-tutorials.html \nextpage creator-project-managing.html + \ingroup creator-tutorials \title Creating a Mobile Application + \brief How to create a Qt Quick application that uses Qt Quick Controls and + runs on Android and iOS devices. + This tutorial describes how to use \QC to develop Qt Quick applications for Android and iOS devices when using Qt 6 as the minimum Qt version and CMake as the build system. - We implement a Qt Quick application that accelerates an SVG (Scalable Vector - Graphics) image based on the changing accelerometer values. + You will develop a Qt Quick application that accelerates an SVG + (Scalable Vector Graphics) image based on changing accelerometer values. \note You must have the \l{Qt Sensors} module from Qt 6.2 or later installed to be able to follow this tutorial. @@ -48,9 +46,6 @@ The main view of the application displays an SVG bubble image that moves around the screen when you tilt the device. - We use \e {Bluebubble.svg} in this tutorial, but you can use any other - image or component instead. - For the image to appear when you run the application, you must specify it as a resource in the \c RESOURCES section of \e CMakeLists.txt file that the wizard created for you: @@ -61,31 +56,33 @@ \section1 Creating the Accelbubble Main View - We create the main view in the \e main.qml file by adding an \l Image + Create the main view in the \e main.qml file by adding an \l Image component with \e Bluebubble.svg as the source: \quotefromfile accelbubble/main.qml \skipto Image \printuntil smooth - Next, we add custom properties to position the image in respect to the width + You can use any other image or component instead. + + Add custom properties to position the image in respect to the width and height of the main window: \printuntil y: - We now want to add code to move the bubble based on Accelerometer sensor - values. First, we add the following import statement: + Add code to move the bubble based on Accelerometer sensor + values. First, add the following import statement: \quotefromfile accelbubble/main.qml \skipto QtSensors \printline QtSensors - Next, we add the \l{Accelerometer} component with the necessary properties: + Add the \l{Accelerometer} component with the necessary properties: \skipto Accelerometer \printuntil active - Then, we add the following JavaScript functions that calculate the + Add the following JavaScript functions that calculate the x and y position of the bubble based on the current Accelerometer values: @@ -94,7 +91,7 @@ \printuntil } \printuntil } - We add the following JavaScript code for \c onReadingChanged signal of + Add the following JavaScript code for \c onReadingChanged signal of Accelerometer component to make the bubble move when the Accelerometer values change: @@ -102,12 +99,12 @@ \skipto onReadingChanged \printuntil } - We want to ensure that the position of the bubble is always + You need to ensure that the position of the bubble is always within the bounds of the screen. If the Accelerometer returns \e {not a number} (NaN), the value is ignored and the bubble position is not updated. - We add \l SmoothedAnimation behavior on the \c x and \c y properties of + Add \l SmoothedAnimation behavior on the \c x and \c y properties of the bubble to make its movement look smoother. \quotefromfile accelbubble/main.qml @@ -126,7 +123,7 @@ an \e AndroidManifest.xml that you can generate in \QC. For more information, see \l{Editing Manifest Files}. - \image qtquick-mobile-tutorial-manifest.png "Accelbubble manifest file" + \image qtquick-mobile-tutorial-manifest.png {Accelbubble manifest file} To generate and use a manifest file, you must specify the Android package source directory, \c QT_ANDROID_PACKAGE_SOURCE_DIR in the \e CMakeLists.txt @@ -136,14 +133,14 @@ \skipto set_property \printuntil ) - Because our CMake version is older than 3.19, we must add a manual + Because the CMake version is older than 3.19, add a manual finalization step to the \c qt_add_executable function: \quotefromfile accelbubble/CMakeLists.txt \skipto qt_add_executable \printuntil ) - We also need to add the \c qt_finalize_executable function: + Then, add the \c qt_finalize_executable function: \skipto qt_finalize_executable \printuntil ) diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc index 4aca5466c39..e80eeca778c 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc @@ -1,13 +1,16 @@ -// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! - \previouspage creator-tutorials.html \example transitions - \nextpage creator-writing-program.html + \previouspage creator-tutorials.html + \nextpage creator-project-managing.html + \ingroup creator-tutorials \title Creating a Qt Quick Application + \brief How to create a Qt Quick Application in the \uicontrol Edit mode. + This tutorial illustrates basic concepts of \l{Qt Quick}. For more information about the UI choices you have, see \l{User Interfaces}. @@ -15,10 +18,10 @@ {states} and \l{Animation and Transitions in Qt Quick}{transitions} when using Qt 6 as the minimum Qt version and CMake as the build system. - We use the \l{Working in Edit Mode}{Edit mode} to create an application + You will use the \l{Working in Edit Mode}{Edit mode} to create an application that moves a Qt logo between three rectangles when you click them. - \image qtquick-tutorial.gif "Transitions example" + \image qtquick-tutorial.gif {Transitions example} For more examples, see \l{Qt Quick Examples and Tutorials}. @@ -35,9 +38,6 @@ The main view of the application displays a Qt logo inside a rectangle in the top left corner of the view and two empty rectangles. - We use the \e qt-logo.png image in this tutorial, but you can also use - any other image or a component, instead. - For the image to appear when you run the application, you must specify it as a resource in the \c RESOURCES section of \e CMakeLists.txt file that the wizard created for you: @@ -49,8 +49,8 @@ \section1 Creating Custom QML Types Because the \l Window QML type requires that you add states into child - components, we use the wizard to create a custom QML type called - \e Page that we will refer to from \e main.qml. + components, use the wizard to create a custom QML type called + \e Page that you refer to from \e Main.qml. To create a custom QML type: @@ -60,14 +60,14 @@ \uicontrol {QML File (Qt Quick 2)}. \li Select \uicontrol Choose to open the \uicontrol Location dialog. \li In the \uicontrol {File name} field, enter a name for the custom - QML type. In this example, we call the type \e Page. + QML type: \e Page. \li Select \uicontrol Next to open the \uicontrol {Project Management} dialog. \li Select \uicontrol Finish to create \e Page.qml. \endlist \QC opens \e Page.qml in the \uicontrol Edit mode. It has a root item - of the type \l Item that we replace with a \l Rectangle type. We give the + of the type \l Item. Replace it with a \l Rectangle type. Give the type the ID \e page, anchor it to the parent item on all sides, and set its color to white: @@ -75,9 +75,6 @@ \skipto import \printuntil color - Because we develop with Qt 6, where version numbers are not used with - modules, we remove the version number from the import statement. - When you start typing the QML type name, \QC suggests available types and properties to \l{Completing Code}{complete the code}. @@ -86,66 +83,67 @@ {Qt Quick Toolbar for rectangles}. You can use it to specify rectangle properties, such as color, transparency, and gradients. - \image qml-toolbar-rectangle.png "Qt Quick Toolbar for rectangles" + \image qml-toolbar-rectangle.png {Qt Quick Toolbar for rectangles} - Next, we add an \l Image type with \e qt-logo.png as the source. We - position the image in the top-left corner of the rectangle: + Next, add an \l Image type with \e qt-logo.png as the source. You can also + use any other image or a component. Position the image in the top-left + corner of the rectangle: \printuntil } You can use the \l{Previewing Images}{Qt Quick Toolbar for images} to specify image properties, such as source file and fill mode. - \image qml-toolbar-image.png "Logo visible in Qt Quick Toolbar for images" + \image qml-toolbar-image.png {Logo visible in Qt Quick Toolbar for images} - We now create the rectangles that the image will move between. Their size + Now, create the rectangles that the image will move between. Their size should match the image size and they should be transparent, so that the - image is visible. We set the border color to light gray to make the + image is visible. Set the border color to light gray to make the rectangles visible: \printuntil border.color - We anchor the rectangles to their parent to position them in its + Anchor the rectangles to their parent to position them in its top-left and bottom-left corners, as well as the vertical center of its right edge. The following code snippet anchors a rectangle to the top-left corner of its parent: \printuntil anchors.topMargin - We add a \l MouseArea type to make the rectangle clickable by users: + Add a \l MouseArea type to make the rectangle clickable by users: \printuntil anchors.fill To check your code, you can compare it with the \e {Page.qml} example file. - Next, we will make the image move between the rectangles when users click - them, by adding states and by connecting mouse clicks to state changes. + Next, make the image move between the rectangles when users click + them by adding states and by connecting mouse clicks to state changes. \section1 Connecting Mouse Clicks to State Changes - To make the image move between the rectangles when users click them, we add - states to the Page component, where we change the values of the \c x and + To make the image move between the rectangles when users click them, add + states to the Page component where you change the values of the \c x and \c y properties of \e icon to match those of the middle right and top left rectangles. To make sure that the image stays within the rectangle - when the view is scaled on different sizes of screens, we \e bind the values + when the view is scaled on different sizes of screens, \e bind the values of the \c x and \c y properties of \e icon to those of the rectangles: \dots \skipto states: \printuntil ] - Then, we connect the \c onClicked signals of the mouse areas to the state + Then, connect the \c onClicked signals of the mouse areas to the state changes: \quotefromfile transitions/Page.qml \skipto Connections { \printuntil } - Because we develop with Qt 6, we must specify the connections as functions. + Because you develop with Qt 6, you must specify the connections as functions. \section1 Adding Page to the Main View - We now open \e main.qml for editing and add an instance of the Page custom + Open \e Main.qml for editing and add an instance of the Page custom component to it: \quotefromfile transitions/main.qml @@ -157,18 +155,18 @@ \section1 Animating Transitions - We will now create transitions to apply animation to the image. For example, + Create transitions to apply animation to the image. For example, the image bounces back when it moves to \e middleRightRect and eases into \e bottomLeftRect. - We specify transitions for switching from each state to the other two + Specify transitions for switching from each state to the other two states: \quotefromfile transitions/Page.qml \skipto transitions: \printuntil }, - We change the easing curve type for transitions to \e State2 from linear to + Change the easing curve type for transitions to \e State2 from linear to \c Easing.OutBounce to create the bounce effect: \printuntil }, @@ -177,9 +175,9 @@ {Qt Quick Toolbar for animation} to specify the easing curve type and animation duration. - \image qml-toolbar-animation.png "Qt Quick Toolbar for animation" + \image qml-toolbar-animation.png {Qt Quick Toolbar for animation} - Then, we change the easing curve type for transitions to \e State2 from + Then, change the easing curve type for transitions to \e State2 from linear to \c Easing.InOutQuad to create the easing effect: \printuntil /^\ {0}\}/ diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc index d0a5b94cc07..8e439c3ce27 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc @@ -1,4 +1,4 @@ -// Copyright (C) 2022 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! @@ -17,37 +17,25 @@ \uicontrol {Project Location} dialog. \li In the \uicontrol Name field, enter a name for the application. - When naming your own projects, keep in mind that they cannot be - easily renamed later. + When naming your own projects, keep in mind that you cannot + easily rename them later. \li In the \uicontrol {Create in} field, enter the path for the project files. You can move project folders later without problems. - \li Select \uicontrol Next (or \uicontrol Continue on \macos) to open - the \uicontrol {Define Build System} dialog. - - \li In the \uicontrol {Build system} field, select \l {Setting Up CMake} - {CMake} as the build system to use for building and running the - project. - - \note If you select \l {Setting Up Qbs}{Qbs}, the instructions for - configuring the project won't apply. - \li Select \uicontrol Next to open the \uicontrol {Define Project Details} dialog. \image qtcreator-project-qt-quick-details.webp {Define Project Details dialog} - \li In the \uicontrol {Minimum required Qt version} field, select - Qt 6.4. + \li Deselect the \uicontrol {Create a project that you can open in \QDS} + check box. - \note This tutorial shows you how to create the application in the - \uicontrol Edit mode. If you select - \uicontrol {Create a project that you can open in \QDS}, the + \note This tutorial shows how to create the application in the + \uicontrol Edit mode. If you leave the check box selected, the following instructions won't apply. - \li Select \uicontrol Next to use the default settings and to open - the \uicontrol {Kit Selection} dialog. + \li Select \uicontrol Next to open the \uicontrol {Kit Selection} dialog. \li Select Qt 6.4 or later \l{glossary-buildandrun-kit}{kits} for the platforms that you want to build the application for. To build diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc index ad38116dffb..d7cdd609455 100644 --- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc +++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc @@ -1,19 +1,17 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - /*! - \previouspage {Creating a Qt Quick Application} \page creator-writing-program.html - \nextpage {Creating a Mobile Application} + \previouspage creator-tutorials.html + \nextpage creator-project-managing.html + \ingroup creator-tutorials \title Creating a Qt Widget Based Application + \brief How to use the integrated \QD to create a Qt widget based application + for the desktop. + This tutorial describes how to use \QC to create a small Qt application, Text Finder. It is a simplified version of the Qt UI Tools \l{Text Finder} example. You'll use \QD to construct the application user interface from @@ -29,11 +27,11 @@ \uicontrol {Application (Qt)} > \uicontrol {Qt Widgets Application} > \uicontrol Choose. - \image qtcreator-new-qt-gui-application.png "New Project dialog" + \image qtcreator-new-qt-gui-application.png {New Project dialog} - The \uicontrol{Introduction and Project Location} dialog opens. + The \uicontrol{Project Location} dialog opens. - \image qtcreator-intro-and-location-qt-gui.png "Introduction and Project Location dialog" + \image qtcreator-intro-and-location-qt-gui.png {Project Location dialog} \li In the \uicontrol{Name} field, type \b {TextFinder}. @@ -44,7 +42,7 @@ \uicontrol Continue (on \macos) to open the \uicontrol {Define Build System} dialog. - \image qtcreator-new-project-build-system-qt-gui.png "Define Build System dialog" + \image qtcreator-new-project-build-system-qt-gui.png {Define Build System dialog} \li In the \uicontrol {Build system} field, select \l {Setting Up CMake} {CMake} as the build system to use for building the project. @@ -52,7 +50,7 @@ \li Select \uicontrol Next or \uicontrol Continue to open the \uicontrol{Class Information} dialog. - \image qtcreator-class-info-qt-gui.png "Class Information dialog" + \image qtcreator-class-info-qt-gui.png {Class Information dialog} \li In the \uicontrol{Class name} field, type \b {TextFinder} as the class name. @@ -66,7 +64,7 @@ \li Select \uicontrol Next or \uicontrol Continue to open the \uicontrol {Translation File} dialog. - \image qtcreator-new-qt-gui-application-translationfile.png "Translation File dialog" + \image qtcreator-new-qt-gui-application-translationfile.png {Translation File dialog} \li In the \uicontrol Language field, you can select a language that you plan to \l {Using Qt Linguist}{translate} the application to. This @@ -76,7 +74,7 @@ \li Select \uicontrol Next or \uicontrol Continue to open the \uicontrol {Kit Selection} dialog. - \image qtcreator-new-project-qt-versions-qt-gui.png "Kit Selection dialog" + \image qtcreator-new-project-qt-versions-qt-gui.png {Kit Selection dialog} \li Select build and run \l{glossary-buildandrun-kit}{kits} for your project. @@ -84,7 +82,7 @@ \li Select \uicontrol Next or \uicontrol Continue to open the \uicontrol {Project Management} dialog. - \image qtcreator-new-project-summary-qt-gui.png "Project Management dialog" + \image qtcreator-new-project-summary-qt-gui.png {Project Management dialog} \li Review the project settings, and select \uicontrol{Finish} (on Windows and Linux) or \uicontrol Done (on \macos) to create the project. @@ -106,7 +104,7 @@ \endlist - \image qtcreator-textfinder-contents.png "TextFinder project contents" + \image qtcreator-textfinder-contents.png {TextFinder project contents} The .h and .cpp files come with the necessary boiler plate code. @@ -120,14 +118,14 @@ \section2 Designing the User Interface - \image qtcreator-textfinder-ui.png "Text Finder UI" + \image qtcreator-textfinder-ui.png {Text Finder UI} \list 1 \li In the \uicontrol{Editor} mode, double-click the textfinder.ui file in the \uicontrol{Projects} view to launch the integrated \QD. - \li Drag and drop the following widgets to the form: + \li Drag the following widgets to the form: \list @@ -137,13 +135,13 @@ \endlist - \image qtcreator-textfinder-ui-widgets.png "Adding widgets to Text Finder UI" + \image qtcreator-textfinder-ui-widgets.png {Adding widgets to Text Finder UI} \note To easily locate the widgets, use the search box at the top of the \uicontrol Sidebar. For example, to find the \uicontrol Label widget, start typing the word \b label. - \image qtcreator-textfinder-filter.png "Filter field" + \image qtcreator-textfinder-filter.png {Filter field} \li Double-click the \uicontrol{Label} widget and enter the text \b{Keyword}. @@ -154,21 +152,21 @@ \li In the \uicontrol Properties view, change the \uicontrol objectName to \b findButton. - \image qtcreator-textfinder-objectname.png "Changing object names" + \image qtcreator-textfinder-objectname.png {Changing object names} \li Press \key {Ctrl+A} (or \key {Cmd+A}) to select the widgets and select \uicontrol{Lay out Horizontally} (or press \key {Ctrl+H} on Linux or Windows or \key {Ctrl+Shift+H} on \macos) to apply a horizontal layout (QHBoxLayout). - \image qtcreator-textfinder-ui-horizontal-layout.png "Applying horizontal layout" + \image qtcreator-textfinder-ui-horizontal-layout.png {Applying horizontal layout} - \li Drag and drop a \uicontrol{Text Edit} widget (QTextEdit) to the form. + \li Drag a \uicontrol{Text Edit} widget (QTextEdit) to the form. \li Select the screen area, and then select \uicontrol{Lay out Vertically} (or press \key {Ctrl+L}) to apply a vertical layout (QVBoxLayout). - \image qtcreator-textfinder-ui.png "Text Finder UI" + \image qtcreator-textfinder-ui.png {Text Finder UI} Applying the horizontal and vertical layouts ensures that the application UI scales to different screen sizes. @@ -274,11 +272,11 @@ \li Select \uicontrol File > \uicontrol {New File} > \uicontrol Qt > \uicontrol {Qt Resource File} > \uicontrol Choose. - \image qtcreator-add-resource-wizard.png "New File dialog" + \image qtcreator-add-resource-wizard.png {New File dialog} The \uicontrol {Choose the Location} dialog opens. - \image qtcreator-add-resource-wizard2.png "Choose the Location dialog" + \image qtcreator-add-resource-wizard2.png {Choose the Location dialog} \li In the \uicontrol{Name} field, enter \b{textfinder}. @@ -287,7 +285,7 @@ The \uicontrol{Project Management} dialog opens. - \image qtcreator-add-resource-wizard3.png "Project Management dialog" + \image qtcreator-add-resource-wizard3.png {Project Management dialog} \li In the \uicontrol{Add to project} field, select \b{TextFinder} @@ -302,7 +300,7 @@ \li Select \uicontrol Add > \uicontrol {Add Files}, to locate and add input.txt. - \image qtcreator-add-resource.png "Editing resource files" + \image qtcreator-add-resource.png {Editing resource files} \endlist @@ -320,6 +318,6 @@ Now that you have all the necessary files, select the \inlineimage icons/run_small.png - button to compile and run your Application. + button to compile and run your application. */ From fe8c276d11f8385ae65da831a3041d1214577833 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 5 Jul 2023 15:31:25 +0200 Subject: [PATCH 019/101] CMakePM: Auto detect generator when not specified in presets Qt Creator would do a compiler probe for CMake presets when the compiler was not set. But the same needs to be done when the generator is not set. Otherwise Qt Creator would set a different generator by default. On Windows is "Ninja". This is different from what CMake does from command line. Task-number: QTCREATORBUG-28693 Change-Id: I96e917b11561a042f9476bad302f3f153e37bafd Reviewed-by: Alessandro Portale --- .../cmakeprojectmanager/cmakeprojectimporter.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 4fef3bda467..00948899f1e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -379,8 +379,10 @@ static QMakeAndCMakePrefixPath qtInfoFromCMakeCache(const CMakeConfig &config, args.push_back(qtcQMakeProbeDir.path().path()); args.push_back("-B"); args.push_back(qtcQMakeProbeDir.filePath("build").path()); - args.push_back("-G"); - args.push_back(cmakeGenerator); + if (!cmakeGenerator.isEmpty()) { + args.push_back("-G"); + args.push_back(cmakeGenerator); + } if (!cmakeGeneratorPlatform.isEmpty()) { args.push_back("-A"); args.push_back(cmakeGeneratorPlatform); @@ -708,8 +710,9 @@ QList CMakeProjectImporter::examineDirectory(const FilePath &importPath, data->sysroot = cache.filePathValueOf("CMAKE_SYSROOT"); CMakeConfig config; - if (cache.valueOf("CMAKE_C_COMPILER").isEmpty() - && cache.valueOf("CMAKE_CXX_COMPILER").isEmpty()) { + const bool noCompilers = cache.valueOf("CMAKE_C_COMPILER").isEmpty() + && cache.valueOf("CMAKE_CXX_COMPILER").isEmpty(); + if (noCompilers || !configurePreset.generator) { QApplication::setOverrideCursor(Qt::WaitCursor); config = configurationFromPresetProbe(importPath, projectDirectory(), configurePreset); QApplication::restoreOverrideCursor(); From 745346cf315181ab46ce8095cea4324bf3bf2424 Mon Sep 17 00:00:00 2001 From: Haowei Hsu Date: Wed, 10 May 2023 13:32:28 +0800 Subject: [PATCH 020/101] .gitignore: Ignore CMakeUserPreset.json And add a template of CMakeUserPresets.json for building on Windows platform in README.md Fixes: QTCREATORBUG-29137 Change-Id: I359a9894e448acb1203de0c6acfc508e65655c03 Reviewed-by: Alessandro Portale Reviewed-by: Cristian Adam --- .gitignore | 1 + README.md | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/.gitignore b/.gitignore index de76458a885..5f55d972059 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ ui_*.h wrapper.bat wrapper.sh debug_toolchain.cmake +CMakeUserPresets.json # qtcreator generated files *.creator.user* diff --git a/README.md b/README.md index 151be8c678c..4bb9109cab0 100644 --- a/README.md +++ b/README.md @@ -164,6 +164,44 @@ Thus, if you want to work on Qt Creator using Qt Creator, you need a separate installation of it. We recommend using a separate, release-built version of Qt Creator to work on a debug-built version of Qt Creator. +Alternatively, take the following template of `CMakeUserPresets.json` for +reference. Write your own configurePreset inheriting `cmake-plugin-minimal` in +`CMakeUserPresets.json` to build with IDEs (such as QtCreator, VSCode, +CLion...etc) locally: + +```json +{ + "version": 4, + "cmakeMinimumRequired": { + "major": 3, + "minor": 23, + "patch": 0 + }, + "configurePresets": [ + { + "name": "custom", + "displayName": "custom", + "description": "custom", + "inherits": "cmake-plugin-minimal", + "binaryDir": "${sourceDir}/build/${presetName}", + "toolset": { + "value": "v142,host=x64", + "strategy": "external" + }, + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_CXX_COMPILER": "cl.exe", + "CMAKE_C_COMPILER": "cl.exe", + "CMAKE_PREFIX_PATH": "c:/Qt/6.2.4/msvc2019_64" + } + } + ] +} +``` + ### Options If you do not have Ninja installed and in the `PATH`, remove `-G Ninja` from From 91222c3a81f2e8f532e3adfc1810c613f7851600 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 5 Jul 2023 18:19:03 +0200 Subject: [PATCH 021/101] CMake: Fix the minimal configure preset By default hidden, so a user will have to have a `CMakeUserPresets.json` file to inherit from it. Changed `BUILD_PLUGINS` and `BUILD_EXECUTABLES` as environment variables prefixed with `QTC_`. Qt Creator's CMake API will check these environment variables. Having them as environment variables allows a `CMakeUserPresets.json` to expand the list like: ``` "environment" : { "QTC_BUILD_PLUGINS" : "$penv{QTC_BUILD_PLUGINS};Terminal" } ``` With `cacheVariables` this is not possible. Task-number: QTCREATORBUG-29137 Change-Id: I925038d90806036abe4610e5c864b72d32960076 Reviewed-by: Alessandro Portale --- CMakePresets.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index b4b859933cd..e103c5221d6 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -5,9 +5,12 @@ "name": "cmake-plugin-minimal", "displayName": "CMake, C++, Git, Debug minimal Build", "generator": "Ninja", + "hidden" : true, + "environment" : { + "QTC_BUILD_PLUGINS": "Core;Designer;DiffEditor;TextEditor;ProjectExplorer;CppEditor;CodePaster;Docker;Git;Help;QmakeProjectManager;CMakeProjectManager;ClangCodeModel;ClangTools;ClangFormat;Debugger;QtSupport;ResourceEditor;VcsBase;Welcome;LanguageClient;RemoteLinux", + "QTC_BUILD_EXECUTABLES": "QtCreator;qtcreator_ctrlc_stub;qtcreator_process_stub;win64interrupt;qtcreator_processlauncher", + }, "cacheVariables": { - "BUILD_PLUGINS": "Core;Designer;DiffEditor;TextEditor;ProjectExplorer;CppEditor;CodePaster;Docker;Git;Help;QmakeProjectManager;CMakeProjectManager;ClangCodeModel;ClangTools;ClangFormat;Debugger;QtSupport;ResourceEditor;VcsBase;Welcome;LanguageClient;RemoteLinux", - "BUILD_EXECUTABLES": "QtCreator;qtcreator_ctrlc_stub;qtcreator_process_stub;win64interrupt;qtcreator_processlauncher", "WITH_QMLDESIGNER": "OFF" } } From 0fde41906a57a739a49d1e841c7d4b5a4b996aca Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 5 Jul 2023 18:58:55 +0200 Subject: [PATCH 022/101] CMake: Fix CMakePresets.json Syntax error, trailing comma. Amends 85ed23e639537d7f9e473c0fd3d016075433a225 Change-Id: I972099822c3a0ac682e3d1b5fe8f63ae92ad8d1d Reviewed-by: Cristian Adam --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index e103c5221d6..53e76c37a69 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -8,7 +8,7 @@ "hidden" : true, "environment" : { "QTC_BUILD_PLUGINS": "Core;Designer;DiffEditor;TextEditor;ProjectExplorer;CppEditor;CodePaster;Docker;Git;Help;QmakeProjectManager;CMakeProjectManager;ClangCodeModel;ClangTools;ClangFormat;Debugger;QtSupport;ResourceEditor;VcsBase;Welcome;LanguageClient;RemoteLinux", - "QTC_BUILD_EXECUTABLES": "QtCreator;qtcreator_ctrlc_stub;qtcreator_process_stub;win64interrupt;qtcreator_processlauncher", + "QTC_BUILD_EXECUTABLES": "QtCreator;qtcreator_ctrlc_stub;qtcreator_process_stub;win64interrupt;qtcreator_processlauncher" }, "cacheVariables": { "WITH_QMLDESIGNER": "OFF" From 0445bef1c8da63463ec2150c2c18fde426350bfe Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 5 Jul 2023 19:14:26 +0200 Subject: [PATCH 023/101] CMake: revert QTC_ environment variable usage for preset Amends 85ed23e639537d7f9e473c0fd3d016075433a225 Keep the hidden part, but the usage of "QTC_BUILD_PLUGINS" : "$penv{QTC_BUILD_PLUGINS};Terminal" doesn't work because the parent environment will be used and not the ancestor preset's environment. Terminal will have to be enabled in the child presets via `"BUILD_PLUGIN_TERMINAL": true` in the "cacheVariables" section. Change-Id: I73c850a47d075a639810ed3aed5ceeb2e25b18de Reviewed-by: Alessandro Portale --- CMakePresets.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 53e76c37a69..0e4b60e22b7 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -6,11 +6,9 @@ "displayName": "CMake, C++, Git, Debug minimal Build", "generator": "Ninja", "hidden" : true, - "environment" : { - "QTC_BUILD_PLUGINS": "Core;Designer;DiffEditor;TextEditor;ProjectExplorer;CppEditor;CodePaster;Docker;Git;Help;QmakeProjectManager;CMakeProjectManager;ClangCodeModel;ClangTools;ClangFormat;Debugger;QtSupport;ResourceEditor;VcsBase;Welcome;LanguageClient;RemoteLinux", - "QTC_BUILD_EXECUTABLES": "QtCreator;qtcreator_ctrlc_stub;qtcreator_process_stub;win64interrupt;qtcreator_processlauncher" - }, "cacheVariables": { + "BUILD_PLUGINS": "Core;Designer;DiffEditor;TextEditor;ProjectExplorer;CppEditor;CodePaster;Docker;Git;Help;QmakeProjectManager;CMakeProjectManager;ClangCodeModel;ClangTools;ClangFormat;Debugger;QtSupport;ResourceEditor;VcsBase;Welcome;LanguageClient;RemoteLinux", + "BUILD_EXECUTABLES": "QtCreator;qtcreator_ctrlc_stub;qtcreator_process_stub;win64interrupt;qtcreator_processlauncher", "WITH_QMLDESIGNER": "OFF" } } From d9e001c50db3abeb0790a08ad18b69b1af29b3ef Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 5 Jul 2023 17:02:50 +0200 Subject: [PATCH 024/101] Doc: Move keyboard shortcut instructions to how-to topics Hide information about using features that were hidden in QDS. Task-number: QTCREATORBUG-29361 Change-Id: I504634091c518d03d1d9e849205293bffc4955b3 Reviewed-by: Eike Ziller --- .../creator-text-editing-macros.qdoc | 5 +- .../src/howto/creator-keyboard-shortcuts.qdoc | 224 ++++++++++++------ .../howto/creator-only/creator-how-tos.qdoc | 18 -- 3 files changed, 157 insertions(+), 90 deletions(-) diff --git a/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc b/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc index da398cff04f..6687e0241ae 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc @@ -1,4 +1,4 @@ -// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! @@ -25,8 +25,7 @@ To assign a keyboard shortcut to a text editing macro, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment > - \uicontrol Keyboard. For more information, see - \l{Configuring Keyboard Shortcuts}. + \uicontrol Keyboard. For more information, see \l{Assign keyboard shortcuts}. You can also use the \c rm locator filter to run a macro. For more information, see \l{Searching with the Locator}. diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc index 3cec4df91d1..e16644c430d 100644 --- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc @@ -17,21 +17,14 @@ \nextpage creator-editor-external.html \endif + \ingroup creator-reference + \title Keyboard Shortcuts - \QC has various keyboard shortcuts that speed up your development - process. You can add more shortcuts if your favorite combination is - missing. In addition, you can specify your own keyboard shortcuts for some - functions that can be easily performed with a mouse, and therefore do not - appear in menus or have default keyboard shortcuts. For example, selecting - and deleting words or lines in an editor. - - To view all functions available in \QC and the keyboard shortcuts defined - for them, select + \QC has various keyboard shortcuts that speed up your development process. + To view all \QC functions in and their keyboard shortcuts, select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment > - \uicontrol Keyboard. The shortcuts are listed by category. To find a keyboard - shortcut in the list, enter a function name or shortcut in the \uicontrol Filter - field. + \uicontrol Keyboard. \image qtcreator-keyboard-shortcuts.png @@ -60,58 +53,10 @@ \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences} - \section1 Configuring Keyboard Shortcuts - - To customize a keyboard shortcut: - - \list 1 - - \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment - > \uicontrol Keyboard. - - \li Select a command from the list. - - \li In the \uicontrol{Key Sequence} field, you have the following - options: - - \list - - \li Enter the shortcut key you want to associate with the - selected command. - - \li Select \uicontrol Record, press the keys to use as the - keyboard shortcut, and select \uicontrol {Stop Recording} - when you are done. - - \endlist - - \li To assign multiple keyboard shortcuts to a function, select - \uicontrol Add, and enter or record an additional key combination. - - \li To revert to the default shortcut, select \uicontrol Reset. - - \endlist - - \QC allows you to use different keyboard shortcut mapping schemes: - - \list - - \li To import a keyboard shortcut mapping scheme, click \uicontrol Import - and select the .kms file that has the keyboard shortcut mapping scheme - you want to import. - - \li To export the current keyboard shortcut mapping scheme, click - \uicontrol Export and select the location where you want to save the - exported .kms file. - - \endlist - - \section1 Default Keyboard Shortcuts - The following tables list the default keyboard shortcuts. They are categorized by actions. - \section2 General Keyboard Shortcuts + \section1 General Keyboard Shortcuts \table \header @@ -183,9 +128,11 @@ \row \li Previous open document in history \li Ctrl+Tab + \if defined(qtcreator) \row \li Activate \uicontrol Locator \li Ctrl+K + \endif \row \li Switch to \uicontrol Welcome mode \li Ctrl+1 @@ -253,6 +200,7 @@ \row \li Undo \li Ctrl+Z + \if defined(qtcreator) \row \li Move to \uicontrol Edit mode @@ -262,6 +210,7 @@ \li The second press closes secondary windows \endlist \li Esc + \endif \row \li Exit \QC @@ -273,7 +222,7 @@ \li Ctrl+Q \endtable - \section2 Editing Keyboard Shortcuts + \section1 Editing Keyboard Shortcuts \table \header @@ -518,7 +467,7 @@ \endtable \if defined(qtcreator) - \section3 Emacs Shortcuts + \section1 Emacs Shortcuts You can specify shortcuts for executing actions in a way that is familiar to \l{https://www.gnu.org/software/emacs/manual/html_node/emacs/index.html} @@ -549,7 +498,7 @@ \li Yank \endlist - \section2 Image Viewer Shortcuts + \section1 Image Viewer Shortcuts \table \header @@ -577,7 +526,7 @@ \endif \if defined(qtdesignstudio) - \section2 Design Mode Keyboard Shortcuts + \section1 Design Mode Keyboard Shortcuts You can use the following keyboard shortcuts when editing QML files in the \uicontrol Design mode. @@ -602,7 +551,8 @@ \endtable \endif - \section2 Debugging Keyboard Shortcuts + \if defined(qtcreator) + \section1 Debugging Keyboard Shortcuts \table \header @@ -639,8 +589,9 @@ \li Reverse direction \li F12 \endtable + \endif - \section2 Project Keyboard Shortcuts + \section1 Project Keyboard Shortcuts \table \header @@ -670,7 +621,7 @@ \li Ctrl+R \endtable - \section2 Help Keyboard Shortcuts + \section1 Help Keyboard Shortcuts \table \header @@ -696,7 +647,7 @@ \li Ctrl+S \endtable - \section2 Version Control Keyboard Shortcuts + \section1 Version Control Keyboard Shortcuts \if defined(qtcreator) \table @@ -830,4 +781,139 @@ \li Alt+G, Alt+U \endtable \endif + + \sa {Assign keyboard shortcuts}, {Find keyboard shortcuts}, + {Import and export keyboard shortcuts} +*/ + +/*! + \page creator-how-to-assign-keyboard-shortcuts.html + \if defined(qtdesignstudio) + \previouspage creator-keyboard-shortcuts.html + \nextpage studio-projects.html + \else + \previouspage creator-how-tos.html + \nextpage creator-known-issues.html + \endif + + \ingroup creator-how-to-ui + + \title Assign keyboard shortcuts + + If your favorite keyboard shortcut is missing, you can add it. Also, you can + assign your own keyboard shortcuts for functions that you can easily perform + with a mouse, and that therefore do not appear in menus or have default + keyboard shortcuts. For example, selecting and deleting words or lines in an + editor. + + To change an existing keyboard shortcut or assign a new one: + + \list 1 + + \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment + > \uicontrol Keyboard. + \image qtcreator-keyboard-shortcuts.png {Keyboard preferences} + + \li Select a command from the list. + + \li In the \uicontrol{Key Sequence} field, you have the following + options: + + \list + + \li Enter the shortcut key you want to associate with the + selected command. + + \li Record a key sequence. + + \endlist + + \li To assign multiple keyboard shortcuts to a function, select + \uicontrol Add, and enter or record an additional key combination. + + \li To revert to the default shortcut, select \uicontrol Reset. + + \endlist + + \section1 Record key sequences + + \list 1 + \li Select \uicontrol Record. + \li Press the keys to use as the keyboard shortcut. + \li Select \uicontrol {Stop Recording} when you are done. + \endlist + + \sa {Keyboard Shortcuts}, {Find keyboard shortcuts}, + {Import and export keyboard shortcuts} +*/ + +/*! + \page creator-how-to-find-keyboard-shortcuts.html + \if defined(qtdesignstudio) + \previouspage creator-keyboard-shortcuts.html + \nextpage studio-projects.html + \else + \previouspage creator-how-tos.html + \nextpage creator-known-issues.html + \endif + + \ingroup creator-how-to-ui + + \title Find keyboard shortcuts + + \QC has many useful keyboard shortcuts. You can see the keyboard shortcut for + a menu command in the menu or the tooltip for a button or in the keyboard + preferences. + + To look up keyboard shortcuts: + + \list 1 + \li Select uicontrol Edit > \uicontrol Preferences > + \uicontrol Environment > \uicontrol Keyboard. + \image qtcreator-keyboard-shortcuts.png {Keyboard preferences} + \li Start typing the name of a function or shortcut in the + \uicontrol Filter field. + \endlist + + You can change the existing keyboard shortcuts or import and export them. + + \sa {Keyboard Shortcuts}, {Assign keyboard shortcuts}, + {Import and export keyboard shortcuts} +*/ + +/*! + \page creator-how-to-change-keyboard-shortcuts.html + \if defined(qtdesignstudio) + \previouspage creator-keyboard-shortcuts.html + \nextpage studio-projects.html + \else + \previouspage creator-how-tos.html + \nextpage creator-known-issues.html + \endif + + \title Import and export keyboard shortcuts + + You can use different keyboard shortcut mapping schemes that are stored as + .kms files. + + To import and export keyboard shortcut mapping schemes: + + \list 1 + + \li Select uicontrol Edit > \uicontrol Preferences > + \uicontrol Environment > \uicontrol Keyboard. + \image qtcreator-keyboard-shortcuts.png {Keyboard preferences} + + \li To import a keyboard shortcut mapping scheme, click \uicontrol Import + and select the .kms file that has the keyboard shortcut mapping scheme + you want to import. + + \li To export the current keyboard shortcut mapping scheme, click + \uicontrol Export and select the location where you want to save the + exported .kms file. + + \endlist + + \sa {Keyboard Shortcuts}, {Assign keyboard shortcuts}, + {Find keyboard shortcuts} */ diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc index ae2b15c2509..45336998465 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc @@ -157,24 +157,6 @@ For additional ways to view other types of output, see \l{Viewing Output}. */ -/*! - \page creator-how-to-find-keyboard-shortcuts.html - \previouspage creator-how-tos.html - \nextpage creator-known-issues.html - \ingroup creator-how-to-ui - - \title Find keyboard shortcuts - - \QC has \l{Keyboard Shortcuts}{many useful keyboard shortcuts}. - You can see the keyboard shortcut for a menu command in the menu - or the tooltip for a button. - - To customize, import, or export keyboard shortcuts, select \uicontrol Edit > - \uicontrol Preferences > \uicontrol Environment > \uicontrol Keyboard. - - \image qtcreator-keyboard-shortcuts.png "Keyboard preferences" -*/ - /*! \page creator-how-to-run-from-cli.html \previouspage creator-how-tos.html From ca3f7a7bb2e591cf39f25ad1f856557d018b9cd2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 5 Jul 2023 15:40:10 +0200 Subject: [PATCH 025/101] Wizards: Improve the bundle id for mac/iOS If an iOS developer doesn't have a wildcard app identifier registered, the app identifier must be in some sense "unique". So just "my.example.com" creates issues in this situation. Qt >= 6.1 tries to set a better bundle id, reading Xcode settings for the last used prefix there, and Qt 6.4 improves on that in case this Xcode setting is not available. So, try to use this mechanism in the wizards. Even with the automatic deduction of a bundle id, this might be completely wrong (the Xcode setting is whatever was used last in a Xcode wizard, regardless of target platform, it can be different for different users, or for different teams that the user works in), and Qt doesn't set it for macOS, so aside from out-of-the-box experience the user should set an explicit bundle at some point. So, keep the CMake property mentioned with a comment in any case. Fixes: QTCREATORBUG-29340 Change-Id: I9dacae5c693ec2e23a9cf8bad660ad939303dbf3 Reviewed-by: Reviewed-by: Alexandru Croitor --- .../wizards/projects/qtquickapplication/CMakeLists.txt | 5 ++++- .../projects/qtquickapplication_compat/CMakeLists.6.x.txt | 5 ++++- .../projects/qtquickapplication_compat/CMakeLists.txt | 8 +++++++- .../wizards/projects/qtwidgetsapplication/CMakeLists.txt | 8 +++++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt index 4166c0217ff..5f9fd95f1b2 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt @@ -27,8 +27,11 @@ qt_add_qml_module(%{TargetName} QML_FILES Main.qml ) +# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. +# If you are developing for iOS or macOS you should consider setting an +# explicit, fixed bundle identifier manually though. set_target_properties(%{TargetName} PROPERTIES - MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com +# MACOSX_BUNDLE_GUI_IDENTIFIER com.example.%{TargetName} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} MACOSX_BUNDLE TRUE diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.6.x.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.6.x.txt index d8e87ead7b4..7e35fcdc014 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.6.x.txt +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.6.x.txt @@ -17,8 +17,11 @@ qt_add_qml_module(%{TargetName} QML_FILES main.qml %{AdditionalQmlFiles} ) +# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. +# If you are developing for iOS or macOS you should consider setting an +# explicit, fixed bundle identifier manually though. set_target_properties(%{TargetName} PROPERTIES - MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com +# MACOSX_BUNDLE_GUI_IDENTIFIER com.example.%{TargetName} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} MACOSX_BUNDLE TRUE diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt index 4d35317a9fe..b7afb831a77 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt @@ -61,8 +61,14 @@ endif() target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick) +# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. +# If you are developing for iOS or macOS you should consider setting an +# explicit, fixed bundle identifier manually though. +if(${QT_VERSION} VERSION_LESS 6.1.0) + set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.%{ProjectName}) +endif() set_target_properties(%{ProjectName} PROPERTIES - MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com + ${BUNDLE_ID_OPTION} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} MACOSX_BUNDLE TRUE diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt index 4bda9db7a79..9d854899c36 100644 --- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt @@ -64,8 +64,14 @@ endif() target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) +# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. +# If you are developing for iOS or macOS you should consider setting an +# explicit, fixed bundle identifier manually though. +if(${QT_VERSION} VERSION_LESS 6.1.0) + set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.%{ProjectName}) +endif() set_target_properties(%{ProjectName} PROPERTIES - MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com + ${BUNDLE_ID_OPTION} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} MACOSX_BUNDLE TRUE From 0dde6338876be0d57beaddfaeaba8e75449acfb9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 5 Jul 2023 15:07:56 +0200 Subject: [PATCH 026/101] Meson: Fix tool argument UI setup The line edit needs to be initialized with the stored arguments. Fixes: QTCREATORBUG-29351 Change-Id: I9c4e0eed05a5c00520aebf1c6c4ea3cf17ef17df Reviewed-by: Christian Stenger --- src/plugins/mesonprojectmanager/ninjabuildstep.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp index ac41aeecfaa..0cb71186bdd 100644 --- a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp +++ b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp @@ -59,6 +59,7 @@ QWidget *NinjaBuildStep::createConfigWidget() buildTargetsList->setFrameShadow(QFrame::Raised); auto toolArguments = new QLineEdit(widget); + toolArguments->setText(m_commandArgs); auto wrapper = Core::ItemViewFind::createSearchableWrapper(buildTargetsList, Core::ItemViewFind::LightColored); From 615a1e52d5e082f7a1132375b228cb9b13309503 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 6 Jul 2023 09:28:04 +0200 Subject: [PATCH 027/101] Doc: Remove help icon from tutorials topic It was used in two places and other similar topics as Tutorials did not have an icon. Change-Id: I79c3502565958fd9f88889603d87ca1fab9d99e3 Reviewed-by: Eike Ziller --- doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc index 40b0ffc1d0a..244310c17bf 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc @@ -8,8 +8,6 @@ \title Tutorials - \image front-help.png - You can use \QC to create applications for several \l{Supported Platforms} {platforms} by using several \l{User Interfaces}{UI technologies}. Follow the tutorials to learn how to create some basic Qt applications. From 86191221b812e5c1dabf14733f2a342e3fbe5983 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 6 Jul 2023 08:32:08 +0200 Subject: [PATCH 028/101] Copilot: fix crash on explicitly completion request Change-Id: I6bdbc25063818399f1d2c81b9e8f7508f57a4b72 Reviewed-by: Marcus Tillmanns --- src/plugins/copilot/copilotplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/copilot/copilotplugin.cpp b/src/plugins/copilot/copilotplugin.cpp index 1a554e13977..bb5c80fa60f 100644 --- a/src/plugins/copilot/copilotplugin.cpp +++ b/src/plugins/copilot/copilotplugin.cpp @@ -74,7 +74,7 @@ void CopilotPlugin::initialize() connect(requestAction, &QAction::triggered, this, [this] { if (auto editor = TextEditor::TextEditorWidget::currentTextEditorWidget()) { - if (m_client->reachable()) + if (m_client && m_client->reachable()) m_client->requestCompletions(editor); } }); From 997570cb29800e1327ac093a372f6938b95a87d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Wed, 5 Jul 2023 23:47:52 +0200 Subject: [PATCH 029/101] SquishTests: Update kit removal function The names of the kits don't change anymore before clicking "Apply". Change-Id: I1477b419053f75c4f761561808fc4c6e5d21b19d Reviewed-by: Reviewed-by: Christian Stenger --- tests/system/suite_general/tst_remove_kits/test.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/system/suite_general/tst_remove_kits/test.py b/tests/system/suite_general/tst_remove_kits/test.py index 567d58508b9..19041c7e04c 100644 --- a/tests/system/suite_general/tst_remove_kits/test.py +++ b/tests/system/suite_general/tst_remove_kits/test.py @@ -22,10 +22,9 @@ kitNameTemplate = "Manual.%s" def __removeKit__(_, kitName): global kitNameTemplate - if kitName == Targets.getStringForTarget(Targets.getDefaultKit()): - # The following kits will be the default kit at that time - kitNameTemplate += " (default)" item = kitNameTemplate % kitName.replace(".", "\\.") + if kitName == Targets.getStringForTarget(Targets.getDefaultKit()): + item += " (default)" mouseClick(waitForObjectItem(":BuildAndRun_QTreeView", item)) clickButton(waitForObject(":Remove_QPushButton")) From 0a4e671ab881fe8f04c3b747711d84c70ccbb3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Wed, 5 Jul 2023 23:59:30 +0200 Subject: [PATCH 030/101] SquishTests: Update session dialog Change-Id: I76919f48e2301c1815eaac39f81e42fa12f59a86 Reviewed-by: Reviewed-by: Christian Stenger --- tests/system/objects.map | 2 +- tests/system/suite_general/tst_session_handling/test.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index 97d44b7ed26..e69bd12677e 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -192,7 +192,7 @@ :Send to Codepaster.protocolBox_QComboBox {name='protocolBox' type='QComboBox' visible='1' window=':Send to Codepaster_CodePaster::PasteView'} :Send to Codepaster.qt_spinbox_lineedit_QLineEdit {name='qt_spinbox_lineedit' type='QLineEdit' visible='1' window=':Send to Codepaster_CodePaster::PasteView'} :Send to Codepaster_CodePaster::PasteView {name='CodePaster.ViewDialog' type='QDialog' visible='1' windowTitle='Send to Codepaster'} -:Session Manager_ProjectExplorer::Internal::SessionDialog {name='ProjectExplorer.SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'} +:Session Manager_ProjectExplorer::Internal::SessionDialog {name='ProjectExplorer.SessionDialog' type='Core::Internal::SessionDialog' visible='1'} :Startup.contextHelpComboBox_QComboBox {container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'} :User Interface.languageBox_QComboBox {name='languageBox' type='QComboBox' visible='1'} :Utils::FakeToolTip {type='Utils::FakeToolTip' unnamed='1' visible='1'} diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py index 1e4b9af0fac..b535145cc91 100644 --- a/tests/system/suite_general/tst_session_handling/test.py +++ b/tests/system/suite_general/tst_session_handling/test.py @@ -63,18 +63,18 @@ def prepareTestExamples(): def switchSession(toSession): test.log("Switching to session '%s'" % toSession) invokeMenuItem("File", "Sessions", "Manage...") - sessionView = ("{name='sessionView' type='ProjectExplorer::Internal::SessionView' visible='1' " + sessionView = ("{name='sessionView' type='Core::Internal::SessionView' visible='1' " "window=':Session Manager_ProjectExplorer::Internal::SessionDialog'}") mouseClick(waitForObjectItem(sessionView, toSession)) clickButton(waitForObject("{name='btOpen' type='QPushButton' visible='1' " "window=':Session Manager_ProjectExplorer::Internal::SessionDialog'}")) def createAndSwitchToSession(toSession): - sessionInputDialog = ("{type='ProjectExplorer::Internal::SessionNameInputDialog' unnamed='1' " + sessionInputDialog = ("{type='Core::Internal::SessionNameInputDialog' unnamed='1' " "visible='1' windowTitle='New Session Name'}") test.log("Switching to session '%s' after creating it." % toSession) invokeMenuItem("File", "Sessions", "Manage...") - clickButton(waitForObject("{name='btCreateNew' text='New' type='QPushButton' visible='1' " + clickButton(waitForObject("{name='btCreateNew' type='QPushButton' visible='1' " "window=':Session Manager_ProjectExplorer::Internal::SessionDialog'}")) lineEdit = waitForObject("{type='QLineEdit' unnamed='1' visible='1' window=%s}" % sessionInputDialog) From f1637f53ec1cb981b0dc1a0bbbddda721e21d1fe Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 6 Jul 2023 10:49:57 +0200 Subject: [PATCH 031/101] QtcJson: Fix warning for Qbs build Change-Id: I8ca6c0494317e7ffd2f64b51380b2dceaf204189 Reviewed-by: Christian Kandeler --- src/shared/json/json.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/json/json.qbs b/src/shared/json/json.qbs index 99726f7d68d..060e1bda9db 100644 --- a/src/shared/json/json.qbs +++ b/src/shared/json/json.qbs @@ -3,7 +3,7 @@ import qbs StaticLibrary { name: "qtcjson" Depends { name: "cpp" } - cpp.cxxLanguageVersion: "c++11" + cpp.cxxLanguageVersion: "c++17" cpp.minimumMacosVersion: project.minimumMacosVersion files: [ "json.cpp", From 7439fe2bd1358291b731703de49f3a9e2d786de0 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 6 Jul 2023 10:55:40 +0200 Subject: [PATCH 032/101] Debugger: Silence soft assert Change-Id: I4966a29ecd09d7ecdc049588ec2747218d45f349 Reviewed-by: hjk --- src/plugins/debugger/debuggerrunconfigurationaspect.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp index 8cf92fe1da8..8811934aee4 100644 --- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp +++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp @@ -155,7 +155,8 @@ bool DebuggerRunConfigurationAspect::useCppDebugger() const static bool projectHasQmlDefines(ProjectExplorer::Project *project) { auto projectInfo = CppEditor::CppModelManager::instance()->projectInfo(project); - QTC_ASSERT(projectInfo, return false); + if (!projectInfo) // we may have e.g. a Python project + return false; return Utils::anyOf(projectInfo->projectParts(), [](const CppEditor::ProjectPart::ConstPtr &part){ return Utils::anyOf(part->projectMacros, [](const Macro ¯o){ From b5086172cc465a7f07462849da11978573061d3d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 6 Jul 2023 14:03:59 +0200 Subject: [PATCH 033/101] Fix button states at startup When opening Qt Creator with clean settings, the run, debug and build actions build be in the wrong state (enabled instead of disabled, no debug icon). This happened because a ProjectExplorer::updateActions call was removed from the end of restoring the session at startup when moving the session handling to Core plugin. That updateActions call shouldn't be necesseray, and isn't if a session is loaded, even if it is the "implicit default", because then sessionLoaded(...) is emitted which results in the updateActions() call. The sessionLoaded(...) signal was not sent if the file for the default session does not exist. Fix that by also sending the signal even if no file was actually loaded. Amends cbeac777a61322fbc2d365c7b83ead8aaaaf4bbf Change-Id: Idb625253f29611e777d85f0feb6c196fae567ed0 Reviewed-by: Christian Kandeler --- src/plugins/coreplugin/session.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/coreplugin/session.cpp b/src/plugins/coreplugin/session.cpp index 7238a09a2ee..6b1723cf1e1 100644 --- a/src/plugins/coreplugin/session.cpp +++ b/src/plugins/coreplugin/session.cpp @@ -609,6 +609,7 @@ bool SessionManager::loadSession(const QString &session, bool initial) return true; } } else if (loadImplicitDefault) { + emit SessionManager::instance()->sessionLoaded(DEFAULT_SESSION); return true; } From 3befa60970f2dac2223df4f017c74f7444596015 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 3 Jul 2023 14:26:35 +0200 Subject: [PATCH 034/101] Fix permanently disabled menus after switching to QmlDesigner and back. Do not fiddle with the enabled state of the menus, they are managed automatically by ActionContainer, depending on enabled state of the actions they contain. Only enabling them in Design mode is the wrong thing to do. Amends 4642c5fd7ddf73b4753037c3616c2d60d5899b6e Fixes: QTCREATORBUG-29268 Change-Id: I3c5704edf787f424f9a9e5e9cb363bbd410db3f2 Reviewed-by: Alessandro Portale --- src/plugins/qmldesigner/designmodewidget.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 1bb427bd055..c4e3128d3f4 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -222,26 +222,18 @@ void DesignModeWidget::setup() // Connect opening of the 'workspaces' menu with creation of the workspaces menu connect(mworkspaces->menu(), &QMenu::aboutToShow, this, &DesignModeWidget::aboutToShowWorkspaces); - Core::ActionContainer *mpanes = Core::ActionManager::actionContainer(Core::Constants::M_VIEW_PANES); - // Initially disable menus - mviews->menu()->setEnabled(false); mworkspaces->menu()->setEnabled(false); - mpanes->menu()->setEnabled(false); // Enable/disable menus when mode is different to MODE_DESIGN connect(Core::ModeManager::instance(), &Core::ModeManager::currentModeChanged, this, - [mviews, mworkspaces, mpanes](Utils::Id mode, Utils::Id) { + [mworkspaces](Utils::Id mode, Utils::Id) { if (mode == Core::Constants::MODE_DESIGN) { - mviews->menu()->setEnabled(true); mworkspaces->menu()->setEnabled(true); - mpanes->menu()->setEnabled(true); } else { - mviews->menu()->setEnabled(false); mworkspaces->menu()->setEnabled(false); - mpanes->menu()->setEnabled(false); } }); From e33b8137df6d721d34a1ff2b35266ed74ca04848 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 4 Jul 2023 12:40:19 +0200 Subject: [PATCH 035/101] CMakePM: Handle qml debugging for CMake presets Fixes: QTCREATORBUG-29311 Change-Id: I437d008a3625156e6a42f2ecaee71744bd9098f6 Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 00948899f1e..a005bd79fa7 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -754,6 +754,8 @@ QList CMakeProjectImporter::examineDirectory(const FilePath &importPath, // Update QT_QMAKE_EXECUTABLE and CMAKE_C|XX_COMPILER config values updateConfigWithDirectoryData(config, data); + data->hasQmlDebugging = CMakeBuildConfiguration::hasQmlDebugging(config); + QByteArrayList buildConfigurationTypes = {cache.valueOf("CMAKE_BUILD_TYPE")}; if (buildConfigurationTypes.front().isEmpty()) { buildConfigurationTypes.clear(); @@ -774,6 +776,13 @@ QList CMakeProjectImporter::examineDirectory(const FilePath &importPath, DirectoryData *newData = new DirectoryData(*data); newData->cmakeBuildType = buildType; + // Handle QML Debugging + auto type = CMakeBuildConfigurationFactory::buildTypeFromByteArray( + newData->cmakeBuildType); + if (type == CMakeBuildConfigurationFactory::BuildTypeDebug + || type == CMakeBuildConfigurationFactory::BuildTypeProfile) + newData->hasQmlDebugging = true; + result.emplace_back(newData); } From 8d749874c6b2fd0253671f02528e81e64628acc2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 5 Jul 2023 09:06:36 +0200 Subject: [PATCH 036/101] German translation: Terminal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I358fd63b2ca039a8f03eef527fa9171787e3619b Reviewed-by: Robert Löhning Reviewed-by: Christian Stenger Reviewed-by: --- share/qtcreator/translations/qtcreator_de.ts | 104 +++++++++---------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index b5877dc1af9..d07073ff688 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -49641,211 +49641,211 @@ Failed to open file "%1" QtC::Terminal Configure... - Einstellungen... + Einstellungen... Sends Esc to terminal instead of Qt Creator. - + Sendet Escape zum Terminal statt zu Qt Creator. Press %1 to send Esc to terminal. - + Drücken Sie %1, um Escape zum Terminal zu senden. Terminal - Terminal + Terminal Sends keyboard shortcuts to Terminal. - + Sendet Tastenkombinationen zum Terminal. Sends keyboard shortcuts to Qt Creator. - + Sendet Tastenkombinationen zu Qt Creator. New Terminal - + Neues Terminal Create a new Terminal. - + Erstelle ein neues Terminal. Next Terminal - + Nächstes Terminal Previous Terminal - + Vorangehendes Terminal Close the current Terminal. - + Das aktuelle Terminal schließen. Devices - Geräte + Geräte The color used for %1. - + Die für "%1" benutzte Farbe. Failed to open file. - + Datei konnte nicht geöffnet werden. JSON parsing error: "%1", at offset: %2 - + Fehler beim Auswerten von JSON: "%1", an Position: %2 No colors found. - + Es wurden keine Farben gefunden. Invalid color format. - + Ungültiges Farbformat. Unknown color scheme format. - + Unbekanntes Farbschema-Format. Use internal terminal - + Integriertes Terminal benutzen Uses the internal terminal when "Run In Terminal" is enabled and for "Open Terminal here". - + Benutzt das integrierte Terminal, wenn "Im Terminal ausführen" aktiviert ist und für "Terminalfenster hier öffnen". Family: - Name: + Name: The font family used in the terminal. - + Der Name der Zeichensatz-Familie, die im Terminal benutzt wird. Size: - Größe: + Größe: The font size used in the terminal (in points). - + Die Größe des Zeichensatzes, der im Terminal benutzt wird (in Punkten). Allow blinking cursor - + Blinkenden Cursor erlauben Allow the cursor to blink. - + Erlaubt dem Cursor zu blinken. Shell path: - + Shell-Pfad: The shell executable to be started. - + Die ausführbare Datei der Shell, die gestartet werden soll. Shell arguments: - + Shell-Argumente: The arguments to be passed to the shell. - + Die Argumente, die an die Shell übergeben werden sollen. Send escape key to terminal - + Escape-Taste zum Terminal senden Sends the escape key to the terminal when pressedinstead of closing the terminal. - + Sendet die Escape-Taste zum Terminal, anstatt das Terminal zu schliessen. Audible bell - + Akustische Glocke Makes the terminal beep when a bell character is received. - + Lässt das Terminal piepen, wenn ein Glockenzeichen empfangen wird. Load Theme... - + Thema laden... Reset Theme - + Thema zurücksetzen Error - Fehler + Fehler General - Allgemein + Allgemein Font - Zeichensatz + Zeichensatz Colors - + Farben Foreground - + Zeichen Background - + Hintergrund Selection - Auswahl + Auswahl Find match - + Fundstelle Default Shell - + Vorgabe-Shell Copy - Kopieren + Kopieren Paste - Einfügen + Einfügen Clear Selection - Auswahl löschen + Auswahl löschen Clear Terminal - + Terminal-Inhalt löschen Move Cursor Word Left - + Cursor ein Wort nach links bewegen Move Cursor Word Right - + Cursor ein Wort nach rechts bewegen Close Terminal - + Terminal schließen From b1423c58180f9b3839bc32a78d6eea2096a27590 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 28 Jun 2023 16:00:59 +0200 Subject: [PATCH 037/101] German translation: ProjectExplorer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I514f163cb7e0489a06ac6d684630b40cf18e7f39 Reviewed-by: Reviewed-by: Robert Löhning --- share/qtcreator/translations/qtcreator_de.ts | 124 ++++++++++--------- 1 file changed, 68 insertions(+), 56 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index d07073ff688..333f027b46a 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -36253,7 +36253,7 @@ Weitere Erklärungen sind möglicherweise in "Ausgabe der Anwendung" z The build device failed to prepare for the build of %1 (%2). - Das Build-Gerät konnte nicht für das Erstellen von %1 (%2) vorbereitet werden. + Das Gerät konnte nicht für das Erstellen von %1 (%2) vorbereitet werden. Compile @@ -36395,7 +36395,7 @@ Weitere Erklärungen sind möglicherweise in "Ausgabe der Anwendung" z Locates files of all open projects. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well. - + Findet Dateien in allen geöffneten Projekten. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen. All Projects @@ -36495,7 +36495,7 @@ Außer: %2 Locates files from the current document's project. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well. - + Findet Dateien im Projekt des aktuellen Dokuments. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen. Project "%1" @@ -37215,23 +37215,23 @@ Bitte versuchen Sie es erneut. Locates files from all project directories. Append "+<number>" or ":<number>" to jump to the given line number. Append another "+<number>" or ":<number>" to jump to the column number as well. - + Findet Dateien in allen Projektverzeichnissen. Fügen Sie "+<Zahl>" oder ":<Zahl>" an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal "+<Zahl>" oder ":<Zahl>" an, um auch zur angegebenen Spalte zu springen. Run Run Configuration - + Ausführungskonfiguration ausführen Runs a run configuration of the active project. - + Führt eine Ausführungskonfiguration des aktiven Projekts aus. Switch Run Configuration - + Ausführungskonfiguration auswählen Switches the active run configuration of the active project. - + Wechselt die aktive Ausführungskonfiguration des aktiven Projekts. Run %1 @@ -37869,7 +37869,7 @@ The name of the build configuration created by default for a generic project. Environment: - Umgebung: + Umgebung: No executable specified. @@ -38167,12 +38167,12 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein &Start Wizard to Add Device... - + Gerät mit &Assistent hinzufügen... Add %1 Add <Device Type Name> - + %1 hinzufügen Yes (id is "%1") @@ -38475,7 +38475,7 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein Show in Application Output when running - + Beim Start in "Ausgabe der Anwendung" anzeigen No device configured. @@ -38756,7 +38756,7 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen. Ignoring invalid task (no text). - + Ignoriere ungültige Aufgabe (kein Text). File Error @@ -39036,47 +39036,57 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen. Creates a widget-based Qt application that contains a Qt Designer-based main window and C++ source and header files to implement the application logic. Preselects a desktop Qt for building the application if available. - + Erstellt eine Widget-basierte Qt-Anwendung mit einem Qt Designer-basierten Hauptfenster und C++-Quell- und Headerdateien zur Implementierung der Applikationslogik. + +Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern verfügbar. Creates a C++ library. You can create:<ul><li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li><li>a shared or static C++ library for use with another project at linktime</li></ul> - + Erstellt eine C++-Bibliothek. Sie können folgendes erstellen:<ul><li>eine dynamisch gebundene C++-Bibliothek zur Verwendung mit <tt>QPluginLoader</tt> zur Laufzeit (Plugins)</li><li>eine statisch oder dynamisch gebundene C++-Bibliothek zur Verwendung in einem anderen Projekt zur Linkzeit</li></ul> Creates a project containing a single main.cpp file with a stub implementation and no graphical UI. Preselects a desktop Qt for building the application if available. - + Erstellt ein Projekt, das aus einer main.cpp-Datei mit einem Implementationsrumpf ohne grafische Benutzeroberfläche besteht. + +Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern verfügbar. PySide 2 - PySide 2 + PySide 2 Define Python Interpreter - + Python-Interpreter festlegen Creates a Qt Quick application that contains an empty window. Use this "compat" version if you want to use other build systems than CMake or Qt versions lower than 6. - + Erstellt eine Qt Quick-Anwendung, die ein leeres Fenster enthält. + +Nutzen Sie diese "Kompatibilitätsversion", falls Sie andere Buildsysteme als CMake oder frühere Qt-Versionen als Qt 6 benutzen wollen. Qt Quick Application (compat) - + Qt Quick-Anwendung (compat) Creates a Qt Quick UI project for previewing and prototyping designs. To develop a full application, create a Qt Quick Application project instead. - + Erstellt ein Qt Quick UI-Projekt für Vorschauen und Design-Prototypen. + +Für vollständige Anwendungen erstellen Sie stattdessen eine Qt Quick-Anwendung. Creates a Qt Quick application that can have both QML and C++ code. You can build the application and deploy it to desktop, embedded, and mobile target platforms. You can select an option to create a project that you can open in Qt Design Studio, which has a visual editor for Qt Quick UIs. - + Erstellt eine Qt Quick-Anwendung, die aus QML- und C++-Code bestehen kann. Unterstützt das Erstellen und Deployment der Anwendung für Desktop, Embedded und Mobile Zielplattformen. + +Wahlweise können Sie ein Projekt erstellen, das in Qt Design Studio geöffnet werden kann, welches einen visuellen Editor für Qt Quick-Benutzeroberflächen enthält. Qt Quick Application @@ -39088,11 +39098,11 @@ You can select an option to create a project that you can open in Qt Design Stud Boost Test (header only) - + Boost Test (nur Header) Boost Test (shared libraries) - + Boost Test (dynamisch gebundene Bibliotheken) Test framework: @@ -39108,7 +39118,7 @@ You can select an option to create a project that you can open in Qt Design Stud Boost install directory (optional): - + Boost-Installationsverzeichnis (optional): Creates a new unit test project. Unit tests allow you to verify that the code is fit for use and that there are no regressions. @@ -39136,11 +39146,11 @@ You can select an option to create a project that you can open in Qt Design Stud Creates a markdown file. - + Erzeugt eine Markdown-Datei. Markdown File - + Markdown-Datei Creates a Java file with boilerplate code. @@ -39198,27 +39208,29 @@ You can select an option to create a project that you can open in Qt Design Stud You must tell Qt Creator which test framework is used inside the project. You should not mix multiple test frameworks in a project. - + Sie müssen Qt Creator mitteilen, welches Test-Framework im Projekt benutzt wird. + +Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen. %{JS: 'tst_' + value('TestCaseName').toLowerCase() + '.' + Util.preferredSuffix('text/x-c++src')} - + %{JS: 'tst_' + value('TestCaseName').toLowerCase() + '.' + Util.preferredSuffix('text/x-c++src')} %{JS: 'tst_' + value('TestCaseName').toLowerCase() + '.qml'} - + %{JS: 'tst_' + value('TestCaseName').toLowerCase() + '.qml'} Test Information - + Testinformation Creates a source file that you can add to an existing test project. - + Erstellt eine Quelldatei, die zu einem existierenden Testprojekt hinzugefügt werden kann. Test Case - + Testfall Creates an empty Nim script file using UTF-8 charset. @@ -39836,11 +39848,11 @@ You should not mix multiple test frameworks in a project. Qt 6.4 - Qt 6.4 + Qt 6.4 Qt 6.5 - Qt 6.5 + Qt 6.5 The minimum version of Qt you want to build the application for. @@ -39890,7 +39902,7 @@ You should not mix multiple test frameworks in a project. Creates a CMake-based test project where you can enter a code snippet to compile and check it. - + Erstellt ein CMake-basiertes Testprojekt, für welches Sie einen Code-Ausschnitt angegeben können, der erstellt und geprüft wird. Code Snippet @@ -41019,7 +41031,7 @@ Was soll %1 tun? Enter the path to the executable - + Geben Sie den Pfad zur ausführbaren Datei ein Executable: @@ -41051,7 +41063,7 @@ Was soll %1 tun? Interpreter: - + Interpreter: X11 Forwarding: @@ -41217,7 +41229,7 @@ Was soll %1 tun? The build directory is not reachable from the build device. - Das Build-Verzeichnis kann auf dem Build-Gerät nicht erreicht werden. + Das Build-Verzeichnis kann auf dem Gerät nicht erreicht werden. Shadow build: @@ -41333,7 +41345,7 @@ Was soll %1 tun? Run device type - + Gerätetyp (Ausführung) Unknown device type @@ -41341,7 +41353,7 @@ Was soll %1 tun? Run device - + Gerät (Ausführung) The device to run the applications on. @@ -41377,11 +41389,11 @@ Was soll %1 tun? Device root directory - + Wurzelverzeichnis des Geräts Build device root directory - + Wurzelverzeichnis des Geräts (Erstellung) Change... @@ -41790,7 +41802,7 @@ fails because Clang does not understand the target architecture. Build device - Build-Gerät + Gerät (Erstellung) The device used to build applications on. @@ -41798,27 +41810,27 @@ fails because Clang does not understand the target architecture. No build device set. - Kein Build-Gerät gesetzt. + Kein Gerät für die Erstellung gesetzt. Build host address - Hostadresse des Build-Geräts + Hostadresse des Geräts (Erstellung) Build SSH port - SSH-Port des Build-Geräts + SSH-Port des Geräts (Erstellung) Build user name - Benutzername des Build-Geräts + Benutzername des Geräts (Erstellung) Build private key file - Private Schlüsseldatei des Build-Geräts + Private Schlüsseldatei des Geräts (Erstellung) Build device name - Build-Gerätename + Gerätename (Erstellung) Run as root user @@ -41879,29 +41891,29 @@ fails because Clang does not understand the target architecture. Source: - Quelle: + Quelle: Target: - Ziel: + Ziel: Copying failed. - + Fehler beim Kopieren. Copying finished. - + Kopieren beendet. Copy file Default CopyStep display name - + Datei kopieren Copy directory recursively Default CopyStep display name - + Verzeichnis rekursiv kopieren From 635e0d6969326b124bab82504803089dd4f50f7c Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 4 Jul 2023 16:19:01 +0200 Subject: [PATCH 038/101] Utils: Make ssize and usize more generic It now works for all container which implement std::size like C arrays. Change-Id: I9ccf2c50b4e7518e44890b52686d5561358bcf8d Reviewed-by: hjk Reviewed-by: Tim Jenssen --- src/libs/utils/algorithm.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h index b75c0d5e4a0..2ea38377d8b 100644 --- a/src/libs/utils/algorithm.h +++ b/src/libs/utils/algorithm.h @@ -218,14 +218,6 @@ OutputContainer setUnionMerge(InputContainer1 &&input1, template OutputContainer setUnionMerge(InputContainer1 &&input1, InputContainer2 &&input2, Merge merge); -///////////////////////// -// usize / ssize -///////////////////////// -template -std::make_unsigned_t usize(Container container); -template -std::make_signed_t ssize(Container container); - ///////////////////////// // setUnion ///////////////////////// @@ -1340,15 +1332,15 @@ OutputContainer setUnionMerge(InputContainer1 &&input1, } template -std::make_unsigned_t usize(Container container) +auto usize(const Container &container) { - return static_cast>(container.size()); + return static_cast>(std::size(container)); } template -std::make_signed_t ssize(Container container) +auto ssize(const Container &container) { - return static_cast>(container.size()); + return static_cast>(std::size(container)); } template From e5acc8b0726667161f9a5df3f4b8ba9a62d89d20 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 15 Jun 2023 15:38:36 +0200 Subject: [PATCH 039/101] SquishTests: Fix verification of debugger detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are now generic debuggers registered - adapt the test accordingly. Change-Id: I102ac0ac44666c4da17ff6ea01f048abba66e6e7 Reviewed-by: Robert Löhning --- .../tst_default_settings/test.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index f710dd1375a..b1bf0b36d55 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -4,6 +4,8 @@ source("../../shared/qtcreator.py") currentSelectedTreeItem = None +sectionInProgress = None +genericDebuggers = [] warningOrError = re.compile('

((Error|Warning).*?)

') def main(): @@ -28,6 +30,7 @@ def __createMinimumIni__(emptyParent): iniFile.close() def __checkKits__(): + global genericDebuggers mouseClick(waitForObjectItem(":Options_QListView", "Kits")) # check compilers expectedCompilers = __getExpectedCompilers__() @@ -51,6 +54,8 @@ def __checkKits__(): __iterateTree__(":BuildAndRun_QTreeView", __dbgFunc__, foundDebugger) test.verify(__compareDebuggers__(foundDebugger, expectedDebuggers), "Verifying found and expected debuggers are equal.") + if not test.compare(len(genericDebuggers), 2, "Verifying generic debugger count."): + test.log(str(genericDebuggers)) # check Qt versions qmakePath = which("qmake") foundQt = [] @@ -87,14 +92,16 @@ def __processSubItems__(treeObjStr, section, parModelIndexStr, doneItems, additionalFunc, *additionalParameters) def __iterateTree__(treeObjStr, additionalFunc, *additionalParameters): - global currentSelectedTreeItem + global currentSelectedTreeItem, sectionInProgress model = waitForObject(treeObjStr).model() - # 1st row: Auto-detected, 2nd row: Manual + # 1st row: Auto-detected, 2nd row: Manual (Debugger has additional section Generic prepended) for sect in dumpIndices(model): + sectionInProgress = str(sect.text) doneItems = [] parentModelIndex = "%s container='%s'}" % (objectMap.realName(sect)[:-1], treeObjStr) __processSubItems__(treeObjStr, sect, parentModelIndex, doneItems, additionalFunc, *additionalParameters) + sectionInProgress = None def __compFunc__(it, foundComp, foundCompNames): # skip sub section items (will continue on its children) @@ -118,9 +125,16 @@ def __compFunc__(it, foundComp, foundCompNames): foundCompNames.append(it) def __dbgFunc__(it, foundDbg): + global sectionInProgress, genericDebuggers waitFor("object.exists(':Path.Utils_BaseValidatingLineEdit')", 2000) pathLineEdit = findObject(":Path.Utils_BaseValidatingLineEdit") - foundDbg.append(str(pathLineEdit.text)) + if sectionInProgress == 'Generic': + debugger = str(pathLineEdit.text) + test.verify(debugger == 'gdb' or debugger == 'lldb', + 'Verifying generic debugger is GDB or LLDB.') + genericDebuggers.append(debugger) + else: + foundDbg.append(str(pathLineEdit.text)) def __qtFunc__(it, foundQt, qmakePath): qtPath = str(waitForObject(":QtSupport__Internal__QtVersionManager.qmake_QLabel").text) From 9d6597105b0873bc04a6fc2e832f019d5f7d868e Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Wed, 5 Jul 2023 18:01:53 +0200 Subject: [PATCH 040/101] Terminal: Fix process staying alive When starting a Terminal Process with TerminalMode::Detached, the Process object was not deleted on app exit and therefor created warnings on exit. This patch changes it so that the osascript does not wait for the process to exit and therefor exits pretty much immediately which deletes the Process object. Fixes: QTCREATORBUG-29375 Change-Id: I08e8b753c98011fdafc32f03886b5c0be7aec801 Reviewed-by: Eike Ziller Reviewed-by: --- .../utils/externalterminalprocessimpl.cpp | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/src/libs/utils/externalterminalprocessimpl.cpp b/src/libs/utils/externalterminalprocessimpl.cpp index b69cf798337..9ac01a7ee74 100644 --- a/src/libs/utils/externalterminalprocessimpl.cpp +++ b/src/libs/utils/externalterminalprocessimpl.cpp @@ -21,7 +21,7 @@ ProcessStubCreator::ProcessStubCreator(TerminalInterface *interface) : m_interface(interface) {} -static const QLatin1String TerminalAppScript{R"( +static const QLatin1String TerminalAppScriptAttached{R"( tell application "Terminal" activate set newTab to do script "%1 && exit" @@ -33,14 +33,27 @@ static const QLatin1String TerminalAppScript{R"( end tell )"}; +static const QLatin1String TerminalAppScriptDetached{R"( + tell application "Terminal" + activate + do script "%1 && exit" + end tell +)"}; + +struct AppScript +{ + QString attached; + QString detached; +}; + expected_str ProcessStubCreator::startStubProcess(const ProcessSetupData &setupData) { const TerminalCommand terminal = TerminalCommand::terminalEmulator(); bool detached = setupData.m_terminalMode == TerminalMode::Detached; if (HostOsInfo::isMacHost()) { - static const QMap terminalMap = { - {"Terminal.app", TerminalAppScript}, + static const QMap terminalMap = { + {"Terminal.app", {TerminalAppScriptAttached, TerminalAppScriptDetached}}, }; if (terminalMap.contains(terminal.command.toString())) { @@ -48,29 +61,36 @@ expected_str ProcessStubCreator::startStubProcess(const ProcessSetupData = Utils::transform(setupData.m_environment.toStringList(), [](const QString &env) { return CommandLine{"export", {env}}.toUserOutput(); }).join('\n'); - const QString shScript = QString("cd '%1'\n%2\nclear\n'%3' %4\n") + + Process *process = new Process(detached ? nullptr : this); + if (detached) { + QObject::connect(process, &Process::done, process, &Process::deleteLater); + } + + QTemporaryFile shFile; + shFile.setAutoRemove(false); + QTC_ASSERT(shFile.open(), + return make_unexpected(Tr::tr("Failed to open temporary script file."))); + + const QString shScript = QString("cd '%1'\n%2\nclear\n'%3' %4\nrm '%5'\n") .arg(setupData.m_workingDirectory.nativePath()) .arg(env) .arg(setupData.m_commandLine.executable().nativePath()) - .arg(setupData.m_commandLine.arguments()); + .arg(setupData.m_commandLine.arguments()) + .arg(shFile.fileName()); - Process *process = new Process(detached ? nullptr : this); - if (detached) - QObject::connect(process, &Process::done, process, &Process::deleteLater); + shFile.write(shScript.toUtf8()); + shFile.close(); - QTemporaryFile *shFile = new QTemporaryFile(process); - QTC_ASSERT(shFile->open(), - return make_unexpected(Tr::tr("Failed to open temporary script file."))); - shFile->write(shScript.toUtf8()); - shFile->close(); - - FilePath::fromUserInput(shFile->fileName()) + FilePath::fromUserInput(shFile.fileName()) .setPermissions(QFile::ExeUser | QFile::ExeGroup | QFile::ExeOther | QFile::ReadUser | QFile::ReadGroup | QFile::ReadOther | QFile::WriteUser | QFile::WriteGroup | QFile::WriteOther); - const QString script - = terminalMap.value(terminal.command.toString()).arg(shFile->fileName()); + const QString script = (detached + ? terminalMap.value(terminal.command.toString()).detached + : terminalMap.value(terminal.command.toString()).attached) + .arg(shFile.fileName()); process->setCommand({"osascript", {"-"}}); process->setWriteData(script.toUtf8()); From d3e649b10b5740b17a1c3a74fb1ef7170908060c Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 7 Jul 2023 07:07:21 +0200 Subject: [PATCH 041/101] AutoTest: Fix scan for Quick Tests Partially reverts a85d7ef5389d504c924206951dd11d5e4c986f4a. Change-Id: Ib928ba2aee8b82d8204939b16070dbf806cafaf9 Reviewed-by: David Schulz --- src/plugins/autotest/quick/quicktestparser.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp index a5acf697feb..4fa8d4fb81d 100644 --- a/src/plugins/autotest/quick/quicktestparser.cpp +++ b/src/plugins/autotest/quick/quicktestparser.cpp @@ -181,8 +181,9 @@ QList QuickTestParser::scanDirectoryForQuickTestQmlFiles(const Fi QList foundDocs; + const Snapshot snapshot = QmlJSTools::Internal::ModelManager::instance()->snapshot(); for (const FilePath &path : std::as_const(dirs)) { - const QList docs = m_qmlSnapshot.documentsInDirectory(path); + const QList docs = snapshot.documentsInDirectory(path); for (const Document::Ptr &doc : docs) { const FilePath fi = doc->fileName(); //const QFileInfo fi(doc->fileName()); From f9a8e4b62d25a9a54fb5c2b2ae67c61bb8f0c4e3 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 7 Jul 2023 07:55:34 +0200 Subject: [PATCH 042/101] Beautfier: Fix layout of ClangFormat page Broke with the removal of the special BoolAspect-in-FormLayout handling in the latest aspect revamp. Change-Id: I61465b0a3318192ff8b7c92ebf45491c4b298b6c Reviewed-by: Eike Ziller --- src/plugins/beautifier/clangformat/clangformatsettings.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.cpp b/src/plugins/beautifier/clangformat/clangformatsettings.cpp index 6a31667edb7..cd1f5e20d23 100644 --- a/src/plugins/beautifier/clangformat/clangformatsettings.cpp +++ b/src/plugins/beautifier/clangformat/clangformatsettings.cpp @@ -35,6 +35,7 @@ ClangFormatSettings::ClangFormatSettings() usePredefinedStyle.setSettingsKey("usePredefinedStyle"); usePredefinedStyle.setLabelText(Tr::tr("Use predefined style:")); + usePredefinedStyle.setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBoxWithoutDummyLabel); usePredefinedStyle.setDefaultValue(true); predefinedStyle.setSettingsKey("predefinedStyle"); From 4991d4b16c7c92b8d3d68b21192fc01e42b0e7ca Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Sun, 2 Jul 2023 01:24:00 +0900 Subject: [PATCH 043/101] Fix crash in ProgressView during boot up In the code below min can be bigger than max. qBound(widget->rect().height(), bounded.y(), parent->height()) Change-Id: Ia65b1ba5917bf3333606e16263ac30819a07a587 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/progressmanager/progressview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp index 45b10286dc4..333df54a518 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.cpp +++ b/src/plugins/coreplugin/progressmanager/progressview.cpp @@ -130,8 +130,8 @@ void ProgressView::mousePressEvent(QMouseEvent *ev) static QPoint boundedInParent(QWidget *widget, const QPoint &pos, QWidget *parent) { QPoint bounded = pos; - bounded.setX(qBound(widget->rect().width(), bounded.x(), parent->width())); - bounded.setY(qBound(widget->rect().height(), bounded.y(), parent->height())); + bounded.setX(std::max(widget->rect().width(), std::min(bounded.x(), parent->width()))); + bounded.setY(std::max(widget->rect().height(), std::min(bounded.y(), parent->height()))); return bounded; } From d0a34587ac32be1257663f3f5d3faef326d08460 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 5 Jul 2023 17:40:56 +0200 Subject: [PATCH 044/101] ClangCodeModel: Fix suppressing warnings via textmark tooltip This functionality was never properly converted when we switched to clangd. Fixes: QTCREATORBUG-29385 Change-Id: Ie06c9ec8bbed6a539ce9f9bf5ba512ae1a7f4b98 Reviewed-by: David Schulz --- src/plugins/clangcodemodel/clangtextmark.cpp | 62 +++++-------------- .../cppeditor/cppcodemodelsettings.cpp | 1 + 2 files changed, 18 insertions(+), 45 deletions(-) diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp index 1a886c248ed..166a55e4f31 100644 --- a/src/plugins/clangcodemodel/clangtextmark.cpp +++ b/src/plugins/clangcodemodel/clangtextmark.cpp @@ -7,7 +7,6 @@ #include "clangconstants.h" #include "clangdclient.h" #include "clangdiagnostictooltipwidget.h" -#include "clangeditordocumentprocessor.h" #include "clangutils.h" #include @@ -49,46 +48,15 @@ Project *projectForCurrentEditor() if (filePath.isEmpty()) return nullptr; - if (auto processor = ClangEditorDocumentProcessor::get(filePath)) { - if (ProjectPart::ConstPtr projectPart = processor->projectPart()) - return projectForProjectPart(*projectPart); - } + if (ProjectPart::ConstPtr projectPart = projectPartForFile(filePath)) + return projectForProjectPart(*projectPart); return nullptr; } -enum class DiagnosticType { Clang, Tidy, Clazy }; -DiagnosticType diagnosticType(const ClangDiagnostic &diagnostic) - -{ - if (!diagnostic.disableOption.isEmpty()) - return DiagnosticType::Clang; - - const DiagnosticTextInfo textInfo(diagnostic.text); - if (DiagnosticTextInfo::isClazyOption(textInfo.option())) - return DiagnosticType::Clazy; - return DiagnosticType::Tidy; -} - void disableDiagnosticInConfig(ClangDiagnosticConfig &config, const ClangDiagnostic &diagnostic) { - switch (diagnosticType(diagnostic)) { - case DiagnosticType::Clang: - config.setClangOptions(config.clangOptions() + QStringList(diagnostic.disableOption)); - break; - case DiagnosticType::Tidy: - config.setChecks(ClangToolType::Tidy, config.checks(ClangToolType::Tidy) + QString(",-") - + DiagnosticTextInfo(diagnostic.text).option()); - break; - case DiagnosticType::Clazy: { - const DiagnosticTextInfo textInfo(diagnostic.text); - const QString checkName = DiagnosticTextInfo::clazyCheckName(textInfo.option()); - QStringList newChecks = config.checks(ClangToolType::Clazy).split(','); - newChecks.removeOne(checkName); - config.setChecks(ClangToolType::Clazy, newChecks.join(',')); - break; - } - } + config.setClangOptions(config.clangOptions() + QStringList(diagnostic.disableOption)); } ClangDiagnosticConfig diagnosticConfig() @@ -210,8 +178,10 @@ ClangDiagnostic convertDiagnostic(const ClangdDiagnostic &src, target.severity = convertSeverity(*src.severity()); const Diagnostic::Code code = src.code().value_or(Diagnostic::Code()); const QString * const codeString = std::get_if(&code); - if (codeString && codeString->startsWith("-W")) + if (codeString && codeString->startsWith("-W")) { target.enableOption = *codeString; + target.disableOption = "-Wno-" + codeString->mid(2); + } for (const CodeAction &codeAction : src.codeActions().value_or(QList())) { const std::optional edit = codeAction.edit(); if (!edit) @@ -304,15 +274,17 @@ ClangdTextMark::ClangdTextMark(TextEditor::TextDocument *doc, actions << action; // Remove diagnostic warning action - Project *project = projectForCurrentEditor(); - if (project && isDiagnosticConfigChangable(project)) { - action = new QAction(); - action->setIcon(Icons::BROKEN.icon()); - action->setToolTip(Tr::tr("Disable Diagnostic in Current Project")); - QObject::connect(action, &QAction::triggered, [diag] { - disableDiagnosticInCurrentProjectConfig(diag); - }); - actions << action; + if (!diag.disableOption.isEmpty()) { + if (Project * const project = projectForCurrentEditor(); + project && isDiagnosticConfigChangable(project)) { + action = new QAction(); + action->setIcon(Icons::BROKEN.icon()); + action->setToolTip(Tr::tr("Disable Diagnostic in Current Project")); + QObject::connect(action, &QAction::triggered, [diag] { + disableDiagnosticInCurrentProjectConfig(diag); + }); + actions << action; + } } return actions; }); diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp index d0976b8128d..7a32011cf54 100644 --- a/src/plugins/cppeditor/cppcodemodelsettings.cpp +++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp @@ -492,6 +492,7 @@ void ClangdProjectSettings::setDiagnosticConfigId(Utils::Id configId) { m_customSettings.diagnosticConfigId = configId; saveSettings(); + emit ClangdSettings::instance().changed(); } void ClangdProjectSettings::blockIndexing() From ea59db0167f39388761504c9afa0be219a73bafe Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 6 Jul 2023 16:51:35 +0200 Subject: [PATCH 045/101] Doc: Edit how-to topics - Add links to missing ones about managing plugins - Add step lists and screenshots Change-Id: I49446020b7d81b6ce5a5e4ad5268ef587df6d20b Reviewed-by: Eike Ziller --- .../creator-how-to-set-high-dpi-scaling.qdoc | 1 + .../howto/creator-only/creator-how-tos.qdoc | 21 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc index 681e6b421ad..849a4dbff52 100644 --- a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc @@ -32,6 +32,7 @@ \list 1 \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Environment > \uicontrol Interface. + \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences} \li Select \uicontrol {Enable high DPI scaling}. \li Restart \QC to have the change take effect. \endlist diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc index 45336998465..48a698d29e6 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc @@ -19,9 +19,11 @@ \section1 Use the UI \list + \li \l {Assign keyboard shortcuts} \li \l {Find a particular preference} \li \l {Find keyboard shortcuts} \li \l {Find menu items on \macos} + \li \l {Import and export keyboard shortcuts} \li \l {Set high DPI scaling} \li \l {Set the number of recent files shown} \li \l {Show and hide sidebars} @@ -83,8 +85,10 @@ \key Ctrl+Tab. To move forward in the location history, press \key {Alt+Right} - (\key {Cmd+Opt+Right} on \macos). To move backward, press \key {Alt+Left} - (\key {Cmd+Opt+Left} on \macos). For example, if you use the \uicontrol Locator + (\key {Cmd+Opt+Right} on \macos). + + To move backward, press \key {Alt+Left} (\key {Cmd+Opt+Left} on \macos). + For example, if you use the \uicontrol Locator to jump to a symbol in the same file, you can jump back to your original location in that file by pressing \key {Alt+Left}. */ @@ -399,11 +403,16 @@ \title Set the number of recent files shown - Set the value of \uicontrol Edit > \uicontrol Preferences > - \uicontrol Environment > \uicontrol System - > \uicontrol {Maximum number of entries in "Recent Files"}. + To set the number of files to list in \uicontrol File > + \uicontrol {Recent Files}: - \image qtcreator-options-environment-system.png "System preferences" + \list 1 + \li Select \uicontrol Edit > \uicontrol Preferences > + \uicontrol Environment > \uicontrol System. + \image qtcreator-options-environment-system.png {System preferences} + \li In \uicontrol {Maximum number of entries in "Recent Files"}, set + the number of files to show. + \endlist */ /*! From e92c61441f179c70351bf936f17af05a392fd13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Thu, 6 Jul 2023 17:58:00 +0200 Subject: [PATCH 046/101] SquishTests: Update tst_SCOM04 Change-Id: Ic41d30987069e9040a20838db1a55876f610a203 Reviewed-by: David Schulz Reviewed-by: Christian Stenger --- tests/system/suite_SCOM/tst_SCOM04/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/suite_SCOM/tst_SCOM04/test.py b/tests/system/suite_SCOM/tst_SCOM04/test.py index 038c8a7a2e6..6351f4216e6 100644 --- a/tests/system/suite_SCOM/tst_SCOM04/test.py +++ b/tests/system/suite_SCOM/tst_SCOM04/test.py @@ -8,7 +8,7 @@ source("../../shared/suites_qtta.py") def main(): # expected error texts - for different compilers expectedErrorAlternatives = ["'SyntaxError' was not declared in this scope", - "\xe2\x80\x98SyntaxError\xe2\x80\x99 was not declared in this scope", + u"\u2018SyntaxError\u2019 was not declared in this scope", "'SyntaxError' : undeclared identifier", # MSVC2013 "'SyntaxError': undeclared identifier", # MSVC2015 "use of undeclared identifier 'SyntaxError'", From 29ca86ce6589252674a7055a522bcf3b34c374d3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 7 Jul 2023 10:11:19 +0200 Subject: [PATCH 047/101] Haskell: Update dependency for manual test Stack didn't want to install that old stuff anymore. Change-Id: I8e196bca92b2a6100c8e4d1431f7588c6efad946 Reviewed-by: hjk --- tests/manual/haskell/simple/stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/manual/haskell/simple/stack.yaml b/tests/manual/haskell/simple/stack.yaml index 9f5c8c628b2..4b8c90d83d1 100644 --- a/tests/manual/haskell/simple/stack.yaml +++ b/tests/manual/haskell/simple/stack.yaml @@ -15,7 +15,7 @@ # resolver: # name: custom-snapshot # location: "./custom-snapshot.yaml" -resolver: lts-7.24 +resolver: lts-21.1 # User packages to be built. # Various formats can be used as shown in the example below. From 6bf6c093cddbe0f7af61877aadc807fc117e33bd Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 5 Jul 2023 17:09:52 +0200 Subject: [PATCH 048/101] CppEditor: Fix parentheses mismatch on comment followed by backslash Apparently, it was mistakenly assumed that a non-zero lexer state implies that the comment continues on the next line when it can also mean that the line ends in a backslash. Adapt the check accordingly. Fixes: QTCREATORBUG-29339 Change-Id: Ib239aca86dae9983d920f7715ae628ab4bf80220 Reviewed-by: David Schulz Reviewed-by: --- src/plugins/cppeditor/cpphighlighter.cpp | 30 +++++++++++++++++-- src/plugins/cppeditor/cpphighlighter.h | 2 ++ .../testcases/highlightingtestcase.cpp | 7 +++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index 656173feee2..f562d9afece 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -56,7 +56,8 @@ void CppHighlighter::highlightBlock(const QString &text) const Tokens tokens = tokenize(text, initialLexerState); lexerState = tokenize.state(); // refresh lexer state - initialLexerState &= ~0x80; // discard newline expected bit + static const auto lexerStateWithoutNewLineExpectedBit = [](int state) { return state & ~0x80; }; + initialLexerState = lexerStateWithoutNewLineExpectedBit(initialLexerState); int foldingIndent = initialBraceDepth; if (TextBlockUserData *userData = TextDocumentLayout::textUserData(currentBlock())) { userData->setFoldingIndent(0); @@ -220,7 +221,8 @@ void CppHighlighter::highlightBlock(const QString &text) if (text.length() > lastTokenEnd) formatSpaces(text, lastTokenEnd, text.length() - lastTokenEnd); - if (!initialLexerState && lexerState && !tokens.isEmpty()) { + if (!initialLexerState && lexerStateWithoutNewLineExpectedBit(lexerState) + && !tokens.isEmpty()) { const Token &lastToken = tokens.last(); if (lastToken.is(T_COMMENT) || lastToken.is(T_DOXY_COMMENT)) { insertParen({Parenthesis::Opened, QLatin1Char('+'), lastToken.utf16charsBegin()}); @@ -636,6 +638,30 @@ void CppHighlighterTest::test() QCOMPARE(actualFormat, expectedFormat); } } + +void CppHighlighterTest::testParentheses_data() +{ + QTest::addColumn("line"); + QTest::addColumn("expectedParenCount"); + + QTest::newRow("function head") << 41 << 2; + QTest::newRow("function opening brace") << 42 << 1; + QTest::newRow("loop head") << 43 << 1; + QTest::newRow("comment") << 44 << 0; + QTest::newRow("loop end") << 45 << 3; + QTest::newRow("function closing brace") << 46 << 1; +} + +void CppHighlighterTest::testParentheses() +{ + QFETCH(int, line); + QFETCH(int, expectedParenCount); + + QTextBlock block = m_doc.findBlockByNumber(line - 1); + QVERIFY(block.isValid()); + QCOMPARE(TextDocumentLayout::parentheses(block).count(), expectedParenCount); +} + } // namespace Internal #endif // WITH_TESTS diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h index 1728ffeb777..e2fac20bba6 100644 --- a/src/plugins/cppeditor/cpphighlighter.h +++ b/src/plugins/cppeditor/cpphighlighter.h @@ -52,6 +52,8 @@ public: private slots: void test_data(); void test(); + void testParentheses_data(); + void testParentheses(); private: QTextDocument m_doc; diff --git a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp index 53ffcc1b55e..d1ec061aa29 100644 --- a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp +++ b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp @@ -37,3 +37,10 @@ const auto s5 = uR"("o ne")"_w; const auto s6 = u"o\ ne"_w; + +static void parenTest() +{ + do { + /* comment */ \ + } while (false); +} From 67f23f331f3ac8362cd5c3734e1a9d56c1a6b839 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 7 Jul 2023 10:19:49 +0200 Subject: [PATCH 049/101] Update qbs submodule to HEAD of 2.1 branch Change-Id: Ic104a5c3339ee42a59bdda3c83c9631057e38395 Reviewed-by: Christian Stenger --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 97769dfdacd..2e6eb75c76c 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 97769dfdacd006f4d82b240371e3ca79d445ab7a +Subproject commit 2e6eb75c76c2d042eb07a8e6bcb4aa03b8843205 From 942a9d0519fa8d18a7aa4c4e85a5ed03cff3870d Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 7 Jul 2023 10:39:59 +0200 Subject: [PATCH 050/101] SquishTests: Avoid different type structures On Windows the read content will be bytes instead of str. To have a unified code path we need to convert it to str. Change-Id: I16004968d8fed7bb2336ad594c31b38100f773cd Reviewed-by: David Schulz --- tests/system/suite_editors/tst_clean_whitespaces/test.py | 2 +- tests/system/suite_editors/tst_select_all/test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_editors/tst_clean_whitespaces/test.py b/tests/system/suite_editors/tst_clean_whitespaces/test.py index 6dab4720f9e..5c9e7aa6a65 100644 --- a/tests/system/suite_editors/tst_clean_whitespaces/test.py +++ b/tests/system/suite_editors/tst_clean_whitespaces/test.py @@ -28,7 +28,7 @@ def main(): baseName = os.path.basename(currentFile) fileName = os.path.join(directory, baseName) test.log("Testing file %s" % fileName) - content = readFile(currentFile) + content = stringify(readFile(currentFile)) preparedContent, emptyLine, trailingWS = prepareFileExternal(fileName, content) isIgnored = isIgnoredFile(baseName, ignoredFiles) test.verify(preparedContent.find('\t') != -1, "Added at least one tab.") diff --git a/tests/system/suite_editors/tst_select_all/test.py b/tests/system/suite_editors/tst_select_all/test.py index bf95250cf77..5a3814aae9d 100644 --- a/tests/system/suite_editors/tst_select_all/test.py +++ b/tests/system/suite_editors/tst_select_all/test.py @@ -18,7 +18,7 @@ def main(): return for currentFile in files: test.log("Opening file %s" % currentFile) - size = len(readFile(currentFile)) + size = len(stringify(readFile(currentFile))) invokeMenuItem("File", "Open File or Project...") selectFromFileDialog(currentFile, True) editor = getEditorForFileSuffix(currentFile) From 5e55e70f52efa558da2d3a870f95432d64d48033 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 7 Jul 2023 13:12:23 +0200 Subject: [PATCH 051/101] RemoteLinux: Guard against nullptr access This fixes a potential crash when switching the device of a kit. Change-Id: Ibdce9859cb347401706fe4de1c56aa8bb890233b Reviewed-by: hjk --- src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp index 1be0624490f..07880089de2 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp @@ -38,7 +38,7 @@ public: auto fetchButton = new QPushButton(Tr::tr("Fetch Device Environment")); addWidget(fetchButton); - connect(target, &Target::kitChanged, [aspect] { aspect->setRemoteEnvironment({}); }); + connect(target, &Target::kitChanged, aspect, [aspect] { aspect->setRemoteEnvironment({}); }); connect(fetchButton, &QPushButton::clicked, this, [aspect, target] { if (IDevice::ConstPtr device = DeviceKitAspect::device(target->kit())) { From 03bab5814b2a74ed016ff6eab65398a35a43a2a9 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 7 Jul 2023 14:15:32 +0200 Subject: [PATCH 052/101] Nim: Fix typing in path chooser Silences a soft assert and re-allows to type paths containing more than one directory separator. Change-Id: I36c400e32b39206669278b89ab4bb033a1f0b6f6 Reviewed-by: hjk --- src/plugins/nim/project/nimtoolchainfactory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/nim/project/nimtoolchainfactory.cpp b/src/plugins/nim/project/nimtoolchainfactory.cpp index 01ec5373b55..415e7e76962 100644 --- a/src/plugins/nim/project/nimtoolchainfactory.cpp +++ b/src/plugins/nim/project/nimtoolchainfactory.cpp @@ -83,7 +83,7 @@ NimToolChainConfigWidget::NimToolChainConfigWidget(NimToolChain *tc) fillUI(); // Connect - connect(m_compilerCommand, &PathChooser::textChanged, this, [this] { + connect(m_compilerCommand, &PathChooser::validChanged, this, [this] { const FilePath path = m_compilerCommand->rawFilePath(); auto tc = static_cast(toolChain()); QTC_ASSERT(tc, return); From 03987976b136296aef73ac7aea5532a0188ab21a Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 6 Jul 2023 15:46:48 +0200 Subject: [PATCH 053/101] Doc: Move output view docs to separate topics - Move some information from "Viewing Output" to the "View output" how-to topic - Add the output view topics to \ingroup creator-reference-output-views and \ingroup studio-reference-output-views Task-number: QTCREATORBUG-29361 Change-Id: Ib91373015f416bf4eb6f5f5123a4ae6e5ebe8d8e Reviewed-by: Eike Ziller --- .../qtcreator-output-panes-taskbar.webp | Bin 3428 -> 9764 bytes ...reator-preferences-application-output.webp | Bin 0 -> 4924 bytes .../qtcreator-preferences-compile-output.webp | Bin 0 -> 3394 bytes .../src/analyze/cpu-usage-analyzer.qdoc | 6 +- .../editors/creator-editors-writing-code.qdoc | 2 +- .../creator-only/creator-code-pasting.qdoc | 2 +- .../creator-only/creator-language-server.qdoc | 2 +- .../creator-semantic-highlighting.qdoc | 6 +- .../src/howto/creator-external-tools.qdoc | 2 +- .../howto/creator-only/creator-autotest.qdoc | 2 +- .../howto/creator-only/creator-how-tos.qdoc | 32 -- .../howto/creator-only/creator-squish.qdoc | 2 +- .../creator-only/creator-configuring.qdoc | 2 +- doc/qtcreator/src/qtcreator-toc.qdoc | 4 - .../creator-file-system-view.qdoc | 1 - .../creator-how-to-view-output.qdoc | 85 ++++ .../creator-reference-sidebar-views.qdoc | 5 - .../creator-reference-terminal-view.qdoc | 111 ++++ .../creator-reference-to-do-entries-view.qdoc | 75 +++ .../creator-open-documents-view.qdoc | 1 - .../user-interface/creator-projects-view.qdoc | 1 - .../creator-reference-output-views.qdoc | 257 ++++++++++ .../src/user-interface/creator-ui.qdoc | 473 +----------------- .../vcs/creator-only/creator-vcs-gitlab.qdoc | 2 +- .../src/qtdesignstudio-toc.qdoc | 1 - 25 files changed, 545 insertions(+), 529 deletions(-) create mode 100644 doc/qtcreator/images/qtcreator-preferences-application-output.webp create mode 100644 doc/qtcreator/images/qtcreator-preferences-compile-output.webp create mode 100644 doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc create mode 100644 doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc create mode 100644 doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc create mode 100644 doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc diff --git a/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp b/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp index 27b5517cb4a7c651bd5249c05b18694db9353039..7801e26ff8f3482a43716023078844569545d71a 100644 GIT binary patch literal 9764 zcmWIYbaRtYV_*n(bqWXzu<#L3V_?u=iPtX z;^gO5GRG~W8N8zzVxP)97SuYl3gVs40R_#uvHL4g=otJ^Xwj28sWa9g(d>^aNZ%n=8+w8U?>oEMThHOR6- zyYaQkibsrhj!%wOpX%4tF!_9<_U^8?k_Fcr=PLYQvN*fr?yKCn%yYLb-7H?=6?9c1 z`eLHgy3Mg}eZ?vXH@D5*wo|ykPWbeKtDF|cjC|*MI;y7T@oE`gZq>fM?bfq7U)oMx zn|#LB_;&rALQ##gKc*N?bKJZ0^QnTH^_~+{ID3O5ZX~FD=h?mC(!mWUK5x=yY*0FV zc6vu-|NIvp4UIwI^V}ITXU_cU!5+VKrrfK!+uz^Y_VS)<+Kd+p(HFzE&XiORH*7gK zW9D1Kvp3}roH;Xb#y^L;iOFrAZr@qcey@s)%{ykgUw?;CT3X)a8E?-#?YPM|H8wV7 zn{s?^O52%t8L4S(8>d9ie6>L3_O{$x=Q?t4hv}AD|17dv13 zY*sr&4v9*ME({XCo)nmR*nDYr)fwl@;hHK@nu>urhnTdz)cJa1RJN^KSgGy%>1uIQ z;G)n)UoPzH(v5I%J@s}%cQpT8welT@W#^o?>=sqrQkJVbZ?(qL^%L0-CH%ec^uk2F zYoDBd$4uOK{xttZc^MAt>Q>ARoZ)#!_S^==HC3& zaO2;n)!m;f({}&dXLM7s(uI>VJ|#=9KKFR{(Ymwirqo5qu)H|U%NUgI=BjaMrsGPb zFsaT-dUuQk9y9%C`jega!Qxy04hC!Gor;m0S~^zN?(UvlD;oJ~k-0_3*OplxUtH`T zS<<-uKMxuA} ztgG*?zo)8ED3!JJPMUn^jKjG_hj)IOKmSSdzj^!Zt{(7yUbw1P_g#yylW0f9_p4F+ z&$SnbeTbQOir;_hqazO(>bG0?wfdfExgeaiDdyrS<)U&k#f~nX^FB?TAJ=cLRMI)n zrW8}Dlyxeoc2mpdIUK3kYD~M*7X%&cK7aF3%lkb$e<~eX5}s54@L8G1xyLi3_i#AL z*H^7LP=0m)LZuWw#&y3#ce5ne6iQUN9=ogdu7AZLrMdOKYzF_k+Edn^`p+28^XS6U z4Hoig$KR$Utj)U5wSMij9UWS;PfNbP{&QY{^uk!b+=(k=Hou?!wkYP_z1By6bi_mj zP1aZO$fs_)CNQD4k=OOZsfOpP9G1JYq*w1caLjtS=f6GcQdPN1@=KYGr}w`3v$pcl z%~s3e=gH1FPdd`qe?6SK;dJ3Y`$F3khU3ERD?g=8ORx!0Nqg!hT9U-B*0o3=jpf3{ zT!;F{4-#EoZLj@Va4jU?)1^?iC9>t_q8Jlqj@h^U%l=+fnw-AfJR&4zg{*YiW5Y9% zPo`Hq@auVTJNNis8~?4&mo9L9o!~29wCIR6hbhDF-IZ3Et^8{zx^KMxYuU+r3^|VO zG5iwSI(C~Z*>lG3@|1TvS!qvS9P+sQ=J&G8E>t@$SjplU;_@P! zJD`82UNl2_l8c>OS>69LYs;pZD7QZ0b69fYpVIP|yPvb93eIv5bS`{0kwy6Vx_5V1 z8vGAw-fi|cK4|7E&)2E`D?C@1=UjA1nQ?K}H+9GNr_J7sMhM_W90v<*w|7 zr&Q>Xi?bUY_+dNL%($T(Iq= zWziFdlg6LRu3K(1XKB8AVg2J05suK~^IxxH{bndO%R%XkdT?{8bp`8*BM%N-n_#fG zVyoM<#h=!2TF(}6adj>b%U6@rYki@=|H`?@6Kt zS2fQ|a%|M@dab1Ay3zY{J3oW^Q?uv41`AVyzF{;v2Lchxfel4RNHU-OyH?v(p;Idq;*s`|z`^OXy zAK}T&Ki;Nm;eY5>&i!t7aiyC6-_w)Vo|i2?obqLz`of2N8Cr3g^NU`Fo88xKUOsK5 z`t)n>}r)7r>J5A^TY|Fax%LT=6>wqzEZwKu{JEcyz>;Fs_SBg_fCH= zyZby>(Otmi###1(Hr{WO%$r(F8ds~*hr1Yh2HSkS$i)hwxRjj(5ow2{0=Q&_yHlU&gbRm({cyNnoWjb!TH zsC-cu?__xqV{7dhy(LWKo{sBNf5{k$oXDcaS63KRG8g#i?-5&AR?MuvI@MV4=QhEW z4KA*!JI`hxSlC;Vxl^-Qh10~h(Rf4e-=f=;j`-k_)UuvtA&$}Y@`Hfwu?{hxiC1N*kWKQ%It)6`$GsOYqK&P9~?tK!b- z$W1wvlD}!C&g_+D#?qZES*7drWLGWU++GxXrDxHn+gu6vg@Ib_PR8#=iuF%^q5TQgp!742Oa#C=azfN{%To-K@@XR73sYVupEUhh07 z`)ZBTtX0<~Uuf_NcV5woojc9Amf1|JUhCzSTlXF)hdU|o%HQhI+{1D9B(HKlmzxD^ zujpHrypqlUPpM0nzUa*P&~t7=cFLLZzjs33KQNVf|7woP6WL#0JPnEhD*|1L7Oz$1 zuMAmV!2fg^$CXzrbl7)sGv8|X=^(W2SK{Q#6CZi?6(%~Y?VIX8_t#gurBi;ptp8WS zDB4!xdqF8^$HUmRiTAnO4O&A_L%%Mm z@(bJ?0b9e$M7m9uMb|7!u;hzm(w8_U-#sJ2E?z?{H1d4Z%S%T~4Q@~C^2-mLtFp%C zmDD+T|}byGkEs znHq>M^}gS;h4J%F6_5Er{pUS}mbjKUOmtXV)O2e>#F6#(u?Jcir>ORo=Gey0%(*Pj zF?UYZa;^y~jGvyZVTeqb^dmB9QNH2Ft@`&K^4XOxlu&tVb4ISYao)7BYlp9BMysrt z_EPL;#Mcj=GyS+_n;(iNbhudSwyM<`C!Ddj$+rAw@Jb+>`PRyF#@C#ZEP}ZO=a=>8 zyNQ9~-{-sJ`dK^=f3*E^(wgA0B<$#=Ducte%bo<5{0ot3ZscOt@P6ZaG-R$Qf8Bzk zY?f@!5dt1f#}hV8W68ZNyGC5h-WSn_*|-O^h*x2NS4V_>=28M{?-@?mPscf*gz+vm?wS+~SH-b{4ilkUvRWi#Zo;pUtewe;O z*}!DelQ|P_=0?8V(s(2#@_D-6f#&z(g>NK$KTHpl_HgjC6FjDG_Be6QEZtkbUM-)S zb%)8#(9yRmvzy_}`iLWaov$1UmoNm|s;rB>*;Cbf(CBj%lQGBiMZr8L8v~E@IR+W9 zI(=DbT)y~gvczXoN7g=;&%aJ&Bp+{hp)%`%z6JxA{b6C&=)$gPhZr|TnV2=b&^@Wg z=O|KqJmKqQrO*Ht3E}nqJtk#5J${QU9obnO9yTOspSu{ua@nZ0SEI^XiMQ~a@>+R? zJ2UO|9OWe|-$)c}o6aW3;M(wRy=i(^(Zo%?y*`P`JZ~mBIA5(v%Sz}G78iUTEOcDG ztVh^}p^NQ#hUNj2rbBKbH&iDcD_zLB+J1)P7TZ}J<*<2w)>OKG!t|*p zx1aJ{wz<4dX$_0riTW>1BDt^XqJRGl58jfrG}?Q{(cg8sOE;!Ge)l-7EBV&_h~HbQ zMQe61{M{n>#^GL_sghJ=O1ocgU%{Te&+eALEieD;wSQ{Zy%mNV>mCc9xysrRxlUhc zR)vT{Rkzl>?q&XZZ%nSg49jskc4N!zI_dm9A7it({LB8Hv`)|AuiLVS{Nv|8^%o?j z3hZ?iJ@0x^UEHiI_=JRX+4t-3uD)Lv&v@)Wj6TC@ZqvA=;~r~n)SC9+Th#G<(W}Ya zs&R_RIoG-k{~xo{v1^e%e4@YpE2U4J{-+Z$_%h6MePHM{1d z{3`v(DcS7zZFduc|Z*hAT zo2&deBJc06S<{~|H5VzEXDwVCtIGI%-N7ktJW4MOd96J=zdwpl=DcS-as5J-2T6-h zm!5eSSRT4*Q(lXL^Pi?GOn;`_=7@>avN>_7#Iv+yvbAc=opy=9ww;+<{&w`NI&Shb zZPufE6U}c02?O%b)qgrRzisL>9WZec3jHn|Fh(2PK8n( z?`gl&yzIG8FHEWSSv)bsGD6+GBq%n-ev*jvoSYJU;mf*rvvO1J81H+S)z0*3b{|v2 z(x+yx&M~}x%k5Nr+O=!lL4}ATk`>O*Gqx{MOb+0g)m(b3?XhEuLG8wc+w+d7W-hvY zV9{kC?b@X`HBk) zf!#jMCEJzOl|^;tneF--z2{;`9=G=i<4dx-iR}xvE-;W6<+pztR=kXB$9%QOCntFt zyfi-<=*KF5esg>~L&@EwAG+c%-Bo!w*cb2QRgyDu+tIDGDLjyM;zN*&9CN#VODKKv zUO0E!?4tUV5aqpfYk23Fop9Ub*XTV-N@oMxt-IS=e{sH_xng2uIrH~N@X09^rc7oz zwx!t?$J5_P_)MD=z3xJ@U(k0}4)(+O%^Z^x4?gXAwOVG4^43irB3Il*@3L7htcgsE zasR$;UB(w}hvkp0OCH4Ti=Lv%8ZarrIdy0FjuZQz^4v{fF4$V7y6YAP*Hp(l513S= zwB~nsiyMhqw5(^nSrcQkXG(O;KjW8w=P#O2yuhq6tt-~H>D)5aV~m&1eCFH{s#GWK zqE*2om6c)XoW6W%>lg;VQZs_L#A8bAB;3QWCBgl`Bi8Hh3FT$ypc_UZCFr(W|}#S3&g3U<4= zy>LBXm3J&jMJ%Ey+f*unXV#?>zcf9eRX;X3ZC-ppjPb+UC|-%bZ=dm7dVZg{;Qsj& zhm}?=UGRHOCx<{}Wr%)kHhz|5s zB%CXkUfAKv%50e?b=lIhjMEnl>yikAUbJJbFO-)_lBD^t!W$|{4sm-M|4Q(1H-}i4)-e9QaCvBDW zcq^Nb)RXOR__>2i9fe{h-jLv4?z+^BQ}vzc;t3JVi&sB?bl0QOZ;rg{)5URLlRoO) zuUCKMlDW(DQ|%N<-hD+l{?=P|Ouw?U_F4U${s({N{a^3yf9KKEhTV4< zt$%K;zW(M@>=TDMQ{At=%+$7V;hwx-@x(s2bM3xnFD0i=ekdnh^;!G$O#TN|o(nAM zUrrXT{`RJF?&0IltF~@mxZ%P22-n{22V@Mp!kZZDu2me{Ig_zO?zY?WxgP{{pUGFO zp0i|cWTD3H&wr-}p1Lgk^36icwHxPJ*R1b3b+}@$NgB4A^& zF zBK|%C-_{h>m!JLqU6kwQsl~6lB2-??j=R|6o4C-&;b>>@9-$Mx-_!0r{LHoN=gXB- zRhciCmKqQ>=ZH5IN`*L@Bh5^k)%vEjnx$CY*a z!XK{E*)F=#9ltw%aDnKUdZ$Prj_%yU}GgV}*aIny%x{I1|Odfc^ zpBF^_2Sv4Xo~jZ)&1SH5=BYnL3eIv(dzQ;(f_?p8DRz?h2ZQgQgCpzf0~6=DtdLRJ z!0>-r_#HPnv4a;qO}tFH6aK}2yjnbetwV^)@1Up`?mmZ{<5=>q_6#UuxJ}=+2Q1$1J**Zau`SGrz-7SA3maXKP-Q+xT$;#~&s(fAvdxRGHo?ZRu z;qK3ERgX9Ev}bHw#=S}Ldc?@K>Jg9*f}Xay&e7?y?yDRTDH8#2b6^pSHOZ|LAjZ?6TjA=0%i4SI-V%6s-DlI` zsPgUC=kIuA`Om5|r!)R4S6_IOs_P1sB9k_r&bqTIR%d?w2{|zTyuF0$hML(Ab0iM^ zo#j~&@$TThKk@T?raiQJySGk1uE}||`SU%;=KE_+Nm9w$r+z%>PnEr@5XVu8)~J{N z<^{>W^AGC}(LCyL<@9su`TyS=E zb+vDM9-jMQb^Ut#p7ph2CQi?Ty`0&OCI&sI(Ck$aU{z~;wmyf^T9!!A=Lg{`rXG8y2KdRX%ak-*fUpc-;aQ^gWzYBpeni4LJo<2XT zUs{*M=vw_Ld-?P8(G!6+!8>S4v#r+T}A?=fCIjt6{y>ASA%5 zX6X7O&uZ=?q1*O9+sl}m7XDgRlxQL;7vEO?+tpr6GD18s;fknhdt`zPr$7Kx2D4X$ z$P5`_0;Y(oRWQu*$ejX8af&@m=K(!}L3Cf#D|}bh!z2GZ{-Yewuyi>BW?m zck_R^ygAVQy2WmmkEOS}d_aBhPR(}-!Lyd#bARh0&gf=%b1_rKuMnoDB?~f)Z0fp} z-PV6_tvBQY-yRRyG{K~O4G;7kqyv;(8Z%pT9=4nIgw|?h%GA%euvJ*Z-u2x#?w(zX z7|S0lm6_FdJi#D0La3i<@|XU$m%=ympQvS4B^zASbXuBc=;GdE^W{IQ=BG>l#amAJ z|Bt_*82`84v31Ya|Ez+aZu}QlIg$N8UO-|0-+IUTn(zNvCxW7Rxt-{bfAL9zojE*( z@oOr}-QRX*FWi4m{r`8{H{XBnnjF6VRLy_=6K7piKWw$E+3;0_i?$!r-Z0zz#(wRu|Kc8=@84WsIrI1H&x`)ow_87KPTc>X zWNFYBwzBW9-`@}a_pNGe{eGk0+tYT19s5{+EM-leudLegFwb|3Rs_$>Uq7qIKC0ym zzi$u!%!!v?sWX<|dh_emmhV4|<4w-a*~8;I+y35$iF20({M@he_3-C=_U!-vmMQvP zJ~WqI;smtTDMw|*uUCu61m^^65Cixm!LyjPL?_1~#%?XfkBk4jD3 zR&nj}_L3vV_x{(PvZHU-MKu>gpZh)&wZ%^FHcHn_1WSaJ+x>TVF6;NM|ND=mAC1=9 zCxn)X{3)=y7%Cglm-J=3{H7-#{&faUxL+vz@TZlPM(nH$yykNAGJ-mJOBdWR?obq5 zDkOc&;SYaVVX0PLQgG_?9}_Q z>AB9@ii>|N*Dsn|8?x=+htt!~9~XGT$Jri||F!a0)w@yOypc_NyLt72kixZA-}+)R-^ymkN%K9Cv9~XLE#qO}!`W%d;Nv^V zj3w#toKv6Io>827W76h{(MuDy&Qa5goT$op+xpruw)K2Ey%*kGYtlS=bMLd`a+@+O zxFmi+4@LoqD6da#g_Cudw)JNgNOG04;9Y6=)e0byhb?Z=+*|YgZ)Q%mwPEXU9MPb zVOTuv?fviVH$N_#TJia4;hekKc5i3SSN-H%|G_L+)qdiu>pu&w)yo}rjPdceX#YOP zUaq*_d;UH1T_H){`}(F!Nq&;xd-i%)2xr8XwFf$rHOuTj%=kXrI8{JYcTq@^_aV8L z921Wh2u!?iG@fg&b;zGr?+%H7SHJ%=K;zv99mn@p{YTfZwB41^hb6-z*y!gUR=Q&K@ z<|v6M+vR3d6C8}n!@&L7gfIBU|So$C!I?-u-kL$^4R;2H>WMUu#@?pw%CkK z3^OL~c+q&N=jFOE-uLDF3s}wrhaWXExGFj|!Mnn0QK|%6!H3KLwC^eY)Gk(u|5CJu@ArZ9H}!mi zG9M3wWl6O?EQ{b+HYJJsVO-epPD`0}XAF%tBrn{|J$qdx)3JLSpG`fu^_boRYrPo} z3Uem?FU={8=~%UL>au0sJGssGy#LWB8!YUz|J-+W_PMWi&X+IWXT*B0_6Em}gr%hm zcfXTbIOW4qy@OvPGXig3$&hnqOMWdLU@x1;QRL3lvoWV)htct;w;io_EZ5qwKW1I+ zw?lWQFSB&p9{TX?+1zPQvRaBZw%q-Gzx?OMjz-gh0-oJh)QsXDEZKf|zQ}HiTT7e7 zXVfu@K6Y4ZaXmSkeL>UKtFwf@_O!n{u;fSU?o+(Qyu4=LmOoyl+p|5FkJHD@F!<}b z9}9PjC=~y$c8Z-+yGHQ+?U0S8DJLF8w8|dm;0u3Nu;NdXf-YayHXF5Vj(y8Ov#DX` z229(c8U>deK67*L+DB72O4^!mT@ZVAh_@i(+S{sw*EsB7#2jv}a65VA4AWV?sQXj& zKU6ASlaAOWJLhBWsvDc6Cd&!kdlBThTEe+HwQokz`Q(@He$Q8K+H&J>ZPnyjLsqo_ zemj=`pM7>=P%!Gfm|;X)Sbp>dQu-P6q>0oQ!+i?BVft$;)n&y^v|## zMl#e?;rB-mEV7{aBGRXO6Zw|dyUxBx}Brf=NH|M(XH%W8}_8x zM|;k)+r_iyJ>2xFAyEpKPtci&RD@a4Pu)K0H6F1M%Do~!gc{Vw8`ON(Nv+$dj$gO>$E;m#^o!g}L|IXPw=kkpgR{PilEy~)KkmnYy zcSh~el>ps!Yp=2BUkH70F=X|$1rld3?_m72%=5M6`41~Q60dh`V7|NhlE8tVr)1WA zx^4UB>GN}Uer|J*oK|taC0+XCOzZjH>vwcLH8&96`1{|Rxq7G1r>m6go_INd`M~69 zKX{&;oBcdUOMlr1mMk@m;N_D0j;rzi`8P4{5Mye_<_Th_LK z$K7aKe{ELc;Twy?7l}zWT%48hz2bS-1G60g|28bjV#!UK#0qli$&ic232Pb~GS+^P zP*`i!HPcYcdZU5cR62EI^-SXM>eKxasw9+}v3YKQ!L}1Qjn@oI zp1qBDkS-?wYx^Ph^d)6)RimZ8dDS=>NX5-$a*VsRPut;}*vyI*E-oKd><~L~d4{jR z6V?Z}J$#RbZxn0&S}gNzV|u}-jfc-I%vRVs<zB|CzO`>?LVh|_V=M!)eq-O#aC^4Xt3?ayKl^@AH3E) zyLkSw-DCew!561QCOne*d(!Bu)n+-8)E=|*v18Tw+IJI{IVYW( zd*RQktrBaUHZM*{;`na+=CAMPSraDAF&5Ac-{<3h`r@lCVphhVOq=GKXU|?ed;4PP Ib#DAD0K}=&qW}N^ literal 3428 zcmWIYbaRX0Wnc(*bqWXzuEVK!y>+I4GNu8QaH{M!2JP#2#DE&JsD^D;O0 zZrRz;H}~0=5KYr-q6gUemzw;)FSUK=w{vICoDoS=Gyc5R$NXLI%-iAzDw4SNtn%nj z*jl$u^6%rU~J|J8Lf|HpQ5~6?GSv)6QUQxm~;oGj`8)oS1@BI3I zd+wHQu?K8?rs@IJE5BApFhn^rXK+rx_2`mZ#K8mq{~w?KaFSR0?6*(n@K2wsZ|S}w z==t{>8%tK@F&ys9y`5F8{^60OBXV{XtoppY%o$KJL)e(p`p%Ggt_7Sm)d8KrKo`6wS# zGEH|bb5?1@-4vy{Z~X#SpNz>bjn(5+uDd#qU(w#`^faOWQFHHByh^bzJ9%Zl-I0VP zKc=c?+n2wtD_`*M<+8aMm1h68mt3{V^PJcizm>hj^zqrhuRkOn%b*G&7^C6m&~vMcJJLrMLs?*AJ9nzPLdWgivU z_HKCO=Jdnjv9gx7^Cb?gbq||sX6j2#);}~kHpgf4lPCq($4isz?zLUpAT)8IMEp}N z2G_^DDN@H~d~$NxCi!ftL)Yt_42LDU`44^6EGTT`IlTIhKu>%Pcg!67wu`Ugn>0VV zew@E(YT;B>nS8f{*+I+`-@n-_yZGg6j_0e>)>Wz7?DN%Y*x_>c_1QJQY?3~utzP|X z;&g7guIXniO8tap3qP;0^}duII5};e!V+=y*F8I(j@ry%lM`mXcc3)neez{fq2|=S zwW|}Y0)5R)gW|;bDtxBh>sV58IdxBpr`F+$tLp@B37}eb{AcOBDVM_Q)Yvb^1gVAC}N%=Uo zS;yYEeapVJKSzGmzaQBvzuoh6(=?I`n4o9#eoJ%zRLNOkTrT&g1pHb4!~f&_NA^eS z?>|2qUCZR;v@PLtgMbs01P6!WlHL3YEiBnPs+epnKF?-e%^B?VB8L091wcoP7+Q!pe|Gjm?|HNnQ%$)UM^Od6KFLvC%`+AP{^#gs2>V7!v z(M{jsc&_ch%t%9vdOj!hUrJupOcre#4(}fJBs1K-rmt7-6yGe}ZR6)8c7e6U!q&EN z_S(HSo{2kg+~(ZRaPFFD@uda*Y+!^4-iQ z^ItAJs&?Yewyq}o|Eh^oxK}ZEUeJ7dBsa-(wz#Kk{FUy2*Bd%dDHeFCTNlb|&Q^KH zn%`M8FXGZO*9VEk=l3Y`PoC8s^7x>dsmuvY-~ZDuOIqgXUoxA$pmq0``c&WBDjA;- zrL*j+>yMisxw%B`-PSzW**h#J1fQDo#%zi4rzN7Cdh^)K!`ATV7SH%Q?Eu#@=RE~G zXWTjadXb*mZT(em^>Q}NWwu;8C2Zl`i4Q%3ciogvX-SB7$!#<_W2kz2;tHK72WD(? zlsN2AbbZ6`==nSC4B?1ud4IPO-Q&#iZi!0gba_LXE*%$0sgX;`sEhN01QX!bP7KELJJ$a$&DrEK{oQ z{N$GE_jkEmmu;(?<-%tE>z>`jpT*ke`u5S0qv8S%)lP2@8BM5PWFX|dWsiZang06Y zB36|~mRa)Bc4yUZ?%)6HLg@}KFQII+j;Y@pJ{@0GJE!c<{!b|plcnM&6q?tFUA*+U zJS{El-5tZjJkE!M~pXRTfmk+CnbK1_xh-nPI67{?4 zh*x*|gx%(wXMN|rzSJzmKjT9`S6T=*xW)TzJgE!&+(tEDb|e`>Y8a`tPcT`&5c9E%Xs z6_}i%C|8vd)?;(}^fQH2iIXqW*qYdc4;lCz-y*nCJ7nUdHQQ%Rw^7>H&h;*fZMi6K zv{t^7qQ!2#!&@%Ah`a6iw!UqH^lh2r58RL3a}Uok{eJpv-c*Nd}{gX zxYNHE9v3`g9dJ;+ZhzR>ia+;Pv&9{3wVLJPX!_RZ9B-Y3)r-mtFEbwef56;rCi`39 zo9SlxE6-H?FH9*oyXxp%aqgg`jEcwGBqv@>?=*=nSpA~4_eiyTO7rW^mHTZFB+T!&b8+m7HPKcc*#mB6c=&*jx)z8J+FIt3d`C5PO zQj3gGykDayW5Va$GB4)Dwf^-1oD7WSS{}*^4aFv_n$Hq_dU3PD!ii40D(YlaewWW#<$Zi0SmiZykK0$R2@YqRpLlZK zfnm6rq_WrIVQiD8te9gG#GyQS!oR0gD)*gVE{L;}JXwDBb!KVk zdF2c9@8xF*H~f|PyJx}aJ^G*b1(k1$l65I&c>8;4vwMhxdag$Pz2^oBs;}Cc0_u-$ zDNX!csl0T3yNOWLCy#Z3Tql#yJ-zACR6XIr9Q%3VYkD)fGWl8vXo0a1H zMd2qo+~(YOY_^6k>2yOlv;)_<;75sE2DUd1vT9Dc$ii`d6(1|6(ceshPi|$?8D0YcS9s|f_+m2-&-ndEUv}Q{*fA)3Z*H%aN&6@Sw^gH+6t|Y+|$T`fJV8y}~Pg$-ZH};ZfsQq-&vb#Z;(ZhpYRJNr|bCTvg{d z3grZ?eVFd#07&F&L1~TT9Q!lao3sJ1rwPP52*0Gm^!ueyk)Ri^n_1m z*Xea}zU~M;D_50X^M23m#=7&NTu0C*TgRi-?IeTdtpd`r@y}o)wF~t5wLSP4D^n|GzN*`l0ZeH6NEgyROk>HfhA8I=H?{seLxZ0`o zX!b{?o3BF6kB5~;tCxlLuD_N$_Xh8(*wEwIS5)@J=Lf1U7K-;wd^Im)kx;zK-&a|u zuI_lWN-Ew}F#OJfTcM?UqI|<-ul+lw`peDW5!X;jOOx*c& zo7m2yyK`=SpHly6PAYfQ>-^_46Dq75R7NKR@-!ERpMTq9SXqTAtX>zxUd&f?cP~ zx^;p~H?_TGRho68?8x2HA1`#jZvoGkS?_|#qJUMG+C&#`va8@?TbX_(=f=f_NxW>& zSE#Q2%oi7#w&48t7m{pMIl{$j7JZePz9>mgRa|z#BX`b%I0d;EXIz_Kw!L^+|7>TLj_AG3%db?feckc!t;dVT*&O1(-|FysOqD;#Gd+J<*TaqXmUtid zakg%8>D?<_ttrWCr?Q@@KI3M0YL8&h`4zJw-MyP0JZ9LE+Ms&2|JZ7_PuIS@P&BwU zPiYEo`td_bO6)>}`}vL6xXg?d4+}lkS-T)puCT%H?t`t- zDM!r2Ha3=R*v7ClX!i02Pd_&L-Vi(3uRp7&c4AfE!BdkyL_=YlWi=K?f>xq#e`q;zeMQwADbC9$+C3Hyrz{tb36RSclNM&TV8h1n$*(W za%+Le0{*8CT8fMPm*lHh<6v;r8K{@TZLETl(n5+QE2*^ zcOCaihC`CsfQpF%g;6YiM>?H_9}|qfUlz zxpqd`>hjACTQ$4)vNm}OeaQ)4%;#jJqSmrrqSx+n%-*_cw&6)7F zL()$DcUWe!t|+f#*5!1%&hmD`6HndTL(i=Xa)N{3l=TEni89YRGAY16`|b?mYeCWv zD~cDEc|G4TCGy&Zo;?AF8|T>+0 zsEI!d{<`@39PGIvro?yeMujI|`Ip!Wuge@$EvG|N=|mHV1X(FdW2UUPT*X>a^d zx5B`FQRJqNFT-|d&YQ4G&`V(5*}iqBuber?BsjsA`%|N=%ZV8k_NGl=xBOdq@krC$ zrCWR#^1hC}a-pa8;<-S?`MuAAO#`NA*XpunLPWOQ(SwaudVp!DQ*Cgq8b zIxVjoKVK&`{h8X#bu%B^@WhLxC$HWTI=doi^)HpOm9vv~?s~dTYWg;{nd@#o3Q=FY z!|B_C**l}ZA23^)R=3ec@+gBH*ScqnbK}o3IRET7d}<&3{?nE{94R8TPS>yP#R3jV=e8+w*Qt&76;5GsP208Nr%hcxVbN9cby0y*da$@dU6>7q|P&UsfzvYUFs8;J%rvsCAs7(~Q-z@vfIr3zk*MFY< zExAsD&koJW5{-5ZP19vfIGtdcT_7>h<<_0A=h&9DwI;W&+ZfrDD{FM2bj5zy z&TMtM9l!8XWn`o!Oa4TWTc!VW?4=K=|L1lT$~@ST_3`&A*Q1g**(*#8`oBGm(7vyC z$ZD2Gkk=m}t-Zg}e@x=CGtH7zG@Y9D1 zga0jF_TZCJRjX>N8FOySl`TJd<5jdexA?pL&+PE_n(E$mQ!-_%%EWJ#4$B+0pQ<17 zXI5ueCdIXrH}@PH(`v;Rekrs63h3tBPrc^qz|3_hC}CF1<%vNGH`f_CYO`ou-<&*Q zmPA5ifQ!_#Zm$GW7GJ)c&GL&>&p!{bkiKA@r^33-(?XWfv7-7=(cb^O_vgNnd1|Ke zq0}+VVB1Z8&lARtoChOUnryr*D5m0d{P%s{ZCo$Rp0LE4<#s=4$NEl-9L{r&(!4c~W2f-V zGz5Kw)nA$NKhEW34c~=T z+1C3t-b~n`a%msu#oJOk=h!BB-0tD6n(XmgET<{BL2{#qbFo5Fh0~2W z96x#bR2q*9=yF7{=N6?NIKVNRNAb3j=3XN+w>s9pmDy85ZYq@a3V%~t)TZt-Q@GV~ zhp}rD3)jSU(M*MwJN!$&oVp?LQ)~+NS+`CDb|GGWkJodYniD4rxZL6kU~`+|-ZLfc ziR9z<3#pq+&M25pw4C7bd{Ks>h9}3N1ZHK$i1qf(T#_OaEhqf=x!1!ZPt>)^gN4m) zO76rdagDtb&pRHBD0Z01{E_YGG3Tceel1c}8=kQ=d2DDD%#BuA8h-59iS(aWPW%b~ z|M9gPukw;*`+qFm;S~M)=7H&d<~^J8f6uCUccXTC>~Re#i%emdbL;Ni)#q1j?>HN~ zD_X67-Fv&0%)c6{x>w}wvHe**(Pr)U)z>@BSI=bl9$C?Qf}vqr$s2R>^7FpG_VebIF-~!lT*JL)<80;WClC5h3~k-EG)`AKW%0tLx2|R}dp}7H z+&JUQUdb!FulB5$vp)7Qc_b zCz{wM`CLrQa^uZ^?Gf7zQwZs~3nZ?tN zSIfr5pMGy$vb=h;Ox^dwbFZI&Iw*C^BBNJe$Byg08}xYQGG!k(S?QuB8O(Rxep^i6 z^UpI+$o~^h{Ok5Pc1g=w(f`-O{1hXvOj=+l__kR!S=Z%$guK7--^+KN{Mk0iBl(E; zq(YlX%lwz>h0MHmq{gAE>-@oPpY+SFx|@{@j=$P9t$KZWNV?KTg*xwhYU>zhUETeV z(ZMsP_-H@NmU%}vtx)Y`yQ0E9cly?kCY*J%q~|tz8UHAK$|%mfMr}tx!j+nU1C7b2 z7i^T&y|Tn4X=U+SwxA@>gy#pgluU|RCR`m_WcHz?=Z%Kr@pIyu3r>q#%yZauVNwU@ zM*e9TAwDH>*N$CQ`H`9D!sg0#@WD)-gu_SFY8Rf;33#nC`=Zm?W!+I~Vjf1>1roij zXSg2zo~pX^g2MD8X5lM$>Nc63Rg45RfMzRQ*fCw|f#RY-!-N=n^RcV|X7e2H-5<8~70`6*}5!r_nNHvO4ZvgI!8Pf z|35!{16%La32hmB-7o9etW2KG;KUd7j$!r*?(B88Qk`Nx{n{^DuQJw!zo?qEJh~$0 zxYPSDYA z-IQ_lqr^$Bw{sS)nwxiD{M)a-+^5`(QIlHaZf!i9ePpI*AKM*P^HaW@wp(ncUGE4M z=FWV1MJ@40TkDP)nhdhHm+eZg{=O>DbZ%1Z>{fl3=S6$nWc#~a63n(U|53QMKK%LO zUkTH@4!*nhZmX<)N0!xxhDjfL!fKt~g&WOt+b{6I$b8lDg*WHSKk+d>`SFhRC-&ZY z+4Eri(Vp)+{x39dv-|IMsA9d%;>)cEulGyLUtgcP)aa~3{pX9;)z5@Kz1yw)Nt@;3 zgS6s9n{VvVH=Cz9&E?jilbJy=@89mduaz_+i(5j*cqfBHe?_pkTg((T{O^lv$k zbIxy)$8Yfli%g@xo7?5JrsnUf|8Um*{hOKR^A$QxK0KB7EIw^=|M0mwvp6Ax2MQdj zUJOw+yE4z$D7_0ZViRGE<(_z2q0;uSRMhhpdxsLU2VJ|o4#)D@${g6;?_pa-6{z}37wfO59(*C zJ3V;h7JJ@cMT3y*zik&Q>SOj8wQduY*&BT({L6F(rAci@`Yc=?9IPMAJFC2M_NpXI zJSL>N#`|9cI|Du-Idf#D}=&4|W#MQ%wr1@2(6a_?Ds z?r~if%lFE>pI10`oY}iVH^c1thvjZ{!ig{Ri`plBYzeD9l)rhu|Iur;Ra<{K=4`&< r!Mw@ErtSMH-yMq|bI+CBxp#A%@A4f{oAy2V`8fEW@l*TB?57z3;;LW= literal 0 HcmV?d00001 diff --git a/doc/qtcreator/images/qtcreator-preferences-compile-output.webp b/doc/qtcreator/images/qtcreator-preferences-compile-output.webp new file mode 100644 index 0000000000000000000000000000000000000000..2dab7f7333c785c824c5b166368aaf59cdbae2dc GIT binary patch literal 3394 zcmWIYbaS)fWnc(*bqWXzu<+62Wnj>s#H7M-o!xp;?$uLg?mhqc{_xyCmlfEH3Z`dE zb2F8x++H+n5^Jw zbzB;>Qbb|uD|?3ymo^@cfW%7*K@B_&EEJis;?aQG5=oP>~(t`u6P{IubN}O!b!C4{U}*Z&{b(;T~HjZ^9W=MSPz>rG_Z!n`76$-@6h;<~$B7W}+5-*@)ZvJQvYxjHih zLKf}vH^}B*B~_;2YUo?S?I2tmUsJvJzd_h!e%5m1WAn=LH&!ordr4f3{UDFqqumde zI2>g52zm5hn!SNhL7=BWPvFc0IguZX?-L%Ru@{_ZXWyPP+ih1L^Wh)m^?P5al{u_( z3VroUKhGdPRx7l=vImCI zy-Tevdl&kIbxo69DK6VCDZ&>2cB*#!Nddoqr_a3qKKEwq$xnF)tTzk(oqp6~(p|H? z41z{tcXw}B`D$}w|7>4}vc#pd(cAI?+S zn{9OLW7Lg`x5<7t_SYRcmYu&V&iSR3wD&fv4-xi<^ES`>u4k5z!1OE?i#8IyZPH)$Z`tFf>lPdjBcYir1pW-c?71Z^flfnt1d} zf9uq^kH!CcVq2T0HG0U{b}yXVw^Tc*Z>#Fvw2v))nZIJ6-!5oS`y^AUf5-Zfsn*hO z3xzbCw%?N2Ui12~fj!Ia*sQB7)K6BsyfzLm%dD)P?zwEg_ZN?YOE(Jrd4DgWEqls5 zZu#1q`a%A^CzS7-N3riddj7Aw?Y@0{>{&|xUvy-C{?(mR7$6(&p=&!K^z8(#87Hbk zk{!EVvhP?a9wu{J``3?Z(dFfh$>PGSo78tIZ4KMcV^d!)I??dy{xI3yQzV^)eH}`z zmX%d@hFxFzvD6|!_$SL*o;SZ%PW;CHe&aRi|9^t(rzHE% zmdx1UxXtI(OZAtjT${>fE_d7Ea>Q@LJcrPW4_9VYc9tHQv0}n^{h+_GFQk-%MU9^5 zt&26iCDmN@p~zS;_|i@utuD>;;X$&g4vOM7p}7%@);!D6sW4nAf1+{bj<^N!2HhqW zS(%wm6QAep7SUHYb3r&rBzQvWNee+;*|lfyACc_ho2<6w&G#$=KU~fd0_dX_}M;%I_t&lf118mrp8;Zet!Mw{`aT1 z-PV{EcEurs(Lamx?F>be#=>Pu2OFIaul{AScSmIOryNE1VB2r^_}Md*EOw~K-*WUh zEPF(53r7xLz~sJ_?aVHX4;F7{+N|(ZPHTg0V1n-t%?Rn4mXa3B&V6eMH~L|8T*!3-_mVA3 zU6l+fvmS|UUh(LLbo}IMsU7P$g>9eTn5V|IG5S!S>_X@IgKM2Kwry^aN)oPJv~#ta zYpqwcgG1sJSxUNm^D zGb-JnZdT#cbgeD*kWgyF#uxXRMLU07G)fRwoyTH(`d8|UCXJ^j7>`~^Q)F5s&3;uo z>U`VgqDdF0n6f%QJYK+%aDGxv20LT#$M2!aQU3F@7h3Gg+RXE{f7Qa@yI*a{{v&t! zfwzcjpoHVwqZX%*{Cg`WEWAi#m1y71yZ1Y;cPyUOQ@B^G@UEcwjCGx=?)As+Z^*u} zLoGRGeXH-BX=|2u2yZ)B(mPc}ZQjOfnqQAJs^`zma4EcX#Q2=`x^)(hb{sP)Ir+g* z?Qi<0SiPT8J>E`E`?g8;SmdO9wsrR4+w+CH$MWZrOzr2B)b_eCZsfdr<5BzmKPruK zj5oauGiP=0d(fB_Z7Dvj;MvmqW<77Z3@_JQH@a-8Dt@o&5zbIZ}*!^g^?hnCA z`Ouu_&tsoI({^dLPtUc>oT2@7k88%+!f65OIYM1;UR*Z);FK0^`TU&bnabVnC))E` zw*2^Z>zBLzj4$%WoY!Mqp2af$-(PmHJb(E0_k^vbCYzG&Zo2y% zP__Y;l9XqffsY$ z-Prdq;8X3a$^SkV2IOq_TV$3rH`iHZk*WDNL!tTZg}?Ny+uhe}o;iP_h0syf^c*3% zi65pbC)DT(3KdE8oNsHDQF=V5@Vku6@$`C67abP8 zpvz(BSmU?YGc43xoP0>HwkP6V80J2WxpDBeasK}Q zwfA=ZU;ARA`JSD!&mAP5vlqR1dqF4sPql94kFV2jJ(;&+(XmIe2dm8`KCgbgcjsKa zRp)0s{rM#F$!e=c{kJYl;~uEKke=pNKVjZMUYpaRv*iy=UcbLZEGCfq(xdlxADn$_ z!G6F({D9i=l*#EIi$o)zg>d=g1Wa*zsp^=YSRrqCr}nQZ?~bIk3x0h5DA;wf^Fny( zA~p{$-_=ulyB%kqd%3m$k$(GCw%Snjq=ts7Vp9mIxb8Ps-uF{jD6H|3 zouib`E>E5hURyZ~&K_lOySj1PiWa|!r!TL^cfAo>w&M71{}b*X@7?LUoN~szPUp}B zdnw(OD}v@Z?pr0?C>5X?# \uicontrol Preferences > \uicontrol {Text Editor} diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc index 219856879c5..8e003556cf8 100644 --- a/doc/qtcreator/src/howto/creator-external-tools.qdoc +++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc @@ -113,7 +113,7 @@ working directory. \li In the \uicontrol Output field, select how to handle output from the - tool. You can ignore the output, view it in \l{Viewing Output} + tool. You can ignore the output, view it in \l{View output} {General Messages}, or replace the selected text with the output in the code editor. diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc index 46b8781c08a..dab584171bc 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc @@ -584,7 +584,7 @@ \section1 Viewing Test Output - The \l{Viewing Output}{Test Results} view shows Qt and Qt Quick test results + The \l{View output}{Test Results} view shows Qt and Qt Quick test results in XML format and other test results in plain text format. \section2 Qt Test Output diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc index 48a698d29e6..c59902f3b04 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc @@ -129,38 +129,6 @@ \image qtcreator-preferences.webp {Filtering preferences} */ -/*! - \page creator-how-to-view-output.html - \previouspage creator-how-tos.html - \nextpage creator-known-issues.html - \ingroup creator-how-to-ui - - \title View output - - The \l{Viewing Output}{taskbar} shows output from - several sources, such as a list of errors and warnings encountered during - a build, detailed output from the compiler, status of a program when it is - executed, debug output, or search results. - - \image qtcreator-output-panes-taskbar.webp "Output on the taskbar" - - To view different types of output, use the following shortcuts: - - \list - - \li \uicontrol{Issues} - \key Alt+1 (\key Cmd+1 on \macos) - - \li \uicontrol{Search Results} - \key Alt+2 (\key Cmd+2 on \macos) - - \li \uicontrol{Application Output} - \key Alt+3 (\key Cmd+3 on \macos) - - \li \uicontrol{Compile Output} - \key Alt+4 (\key Cmd+4 on \macos) - - \endlist - - For additional ways to view other types of output, see \l{Viewing Output}. -*/ - /*! \page creator-how-to-run-from-cli.html \previouspage creator-how-tos.html diff --git a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc index 874b4b389e4..25b2d54dad5 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc @@ -22,7 +22,7 @@ \li Record test cases (in a very limited way compared to what you can do inside the Squish IDE). \li Use Squish Runner and Server to run test suites or cases and view - the results in the \uicontrol Squish \l{Viewing Output}{output}. + the results in the \uicontrol Squish \l{View output}{output}. \li Set breakpoints before running tests to stop at certain locations and inspect the local variables, similarly to when debugging a test. \endlist diff --git a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc index 2e9330159f5..95906339121 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc @@ -8,7 +8,7 @@ // ********************************************************************** /*! - \previouspage creator-output-panes.html + \previouspage creator-quick-tour.html \page creator-configuring.html \nextpage creator-build-example-application.html diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 3a6e5c2ccc3..da6f5444c50 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -1,7 +1,6 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - /*! \page qtcreator-toc.html @@ -18,9 +17,6 @@ \list \li \l{IDE Overview} \li \l{User Interface} - \list - \li \l{Viewing Output} - \endlist \li \l{Configuring Qt Creator} \li \l{Building and Running an Example} \li \l{Tutorials} diff --git a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc index 793fa213daa..26a7472500c 100644 --- a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc @@ -8,7 +8,6 @@ \nextpage creator-open-documents-view.html \else \previouspage creator-how-to-show-and-hide-sidebars.html - \nextpage creator-output-panes.html \endif \ingroup creator-reference-sidebar-views diff --git a/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc new file mode 100644 index 00000000000..2121bd247a2 --- /dev/null +++ b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc @@ -0,0 +1,85 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \page creator-how-to-view-output.html + \if defined(qtdesignstudio) + \previouspage creator-quick-tour.html + \else + \previouspage creator-how-tos.html + \endif + + \ingroup creator-how-to-ui + + \title View output + + The \e {output views} show output from several sources, such as a list of + errors and warnings encountered during a build, detailed output from the + compiler, status of a program when it is executed, debug output, or search + results. + + \image qtcreator-output-panes-taskbar.webp {Output views} + + You can open output views in all + \if defined (qtcreator) + \l{Switch between modes}{modes} + \else + modes + \endif in the following ways: + + \list + \if defined(qtcreator) + \li Select the output view. + \endif + \li Select \uicontrol View > \uicontrol Output. + The menu items also display the \l{Keyboard Shortcuts} + {keyboard shortcuts} that you can use. + \li Select \key Alt (\key Cmd on \macos) and the number of the view. + \li Select \inlineimage icons/output-pane-menu.png + , and then select the view to open. + \endlist + + To maximize an open output view, select the \inlineimage icons/arrowup.png + (\uicontrol Maximize) button or press \key {Alt+Shift+9}. + + To increase or decrease the output text size, select \inlineimage icons/plus.png + (\uicontrol {Zoom In}) or \inlineimage icons/minus.png + (\uicontrol {Zoom Out}), or press \key Ctrl++ or \key Ctrl+-. Zooming is + not supported in all output views. + + \section1 Change text encoding + + If the text in the output is not displayed correctly, \QC might + be using a different codec from the one used by the tools that generate + the output. To specify the codec to use, select \uicontrol Edit > + \uicontrol Preferences > \uicontrol Environment > \uicontrol Interface, and + then select the codec in the \uicontrol {Text codec for tools} field. + + \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences} + + \section1 Find and filter output + + To search from output, press \key {Ctrl+F} when the view is active. Enter + search criteria in the \uicontrol Find field. For more information, see + \l{Finding and Replacing}. + + To filter output, enter a string in the \uicontrol Filter field. + + To specify filtering options, + select the \inlineimage icons/magnifier.png {Filtering options menu} + button. You can filter output by using regular expressions or + case-sensitivity. Select \uicontrol {Show Non-matching Lines} to + hide the lines that match the filter. + + Some output views do not support finding and filtering. + + \section1 Output views + + The following views show output: + + \if defined(qtcreator) + \annotatedlist creator-reference-output-views + \else + \annotatedlist studio-reference-output-views + \endif +*/ diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc index 90c26db8d2c..ca147e76dcf 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc @@ -4,7 +4,6 @@ /*! \page creator-outline-view.html \previouspage creator-how-to-show-and-hide-sidebars.html - \nextpage creator-output-panes.html \ingroup creator-reference-sidebar-views \title Outline @@ -33,7 +32,6 @@ /*! \page creator-class-view.html \previouspage creator-how-to-show-and-hide-sidebars.html - \nextpage creator-output-panes.html \ingroup creator-reference-sidebar-views \title Class View @@ -54,7 +52,6 @@ /*! \page creator-call-hierarchy-view.html \previouspage creator-how-to-show-and-hide-sidebars.html - \nextpage creator-output-panes.html \ingroup creator-reference-sidebar-views \title Call Hierarchy @@ -77,7 +74,6 @@ /*! \page creator-type-hierarchy.html \previouspage creator-how-to-show-and-hide-sidebars.html - \nextpage creator-output-panes.html \ingroup creator-reference-sidebar-views \title Type Hierarchy @@ -110,7 +106,6 @@ /*! \page creator-include-hierarchy-view.html \previouspage creator-how-to-show-and-hide-sidebars.html - \nextpage creator-output-panes.html \ingroup creator-reference-sidebar-views \title Include Hierarchy diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc new file mode 100644 index 00000000000..a87ec969c80 --- /dev/null +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc @@ -0,0 +1,111 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \page creator-reference-terminal-view.html + \previouspage creator-how-to-view-output.html + + \ingroup creator-reference-output-views + + \title Terminal + + \brief Opens a terminal. + + When you select the \uicontrol {Run in Terminal} check box and run an + application or the \uicontrol {Open Terminal} button to open a terminal, + it opens as an output view. + + To open the terminal in a separate window, select \uicontrol Edit > + \uicontrol Preferences > \uicontrol Terminal, and deselet the + \uicontrol {Use internal terminal} check box. + + On Linux and \macos, you can set the terminal to open by selecting + \uicontrol Edit > \uicontrol Preferences > + \uicontrol Environment > \uicontrol System. + + \image qtcreator-output-terminal.webp {Terminal pane} + + \list + \li To clear the terminal, select \inlineimage icons/clean_pane_small.png + (\uicontrol Clear). + + \li To close the current terminal, select \inlineimage icons/terminal-close.png + . + + \li To open new terminals as tabs, select \inlineimage icons/terminal-create.png + . + + \li To move between terminals, select the tabs or \inlineimage icons/arrowup.png + and \inlineimage icons/arrowdown.png + . + + \li To select a word in a terminal, double-click it. To select the whole line, + triple-click it. + + \li To open links in a browser, files in the editor, or folders in the + \l Projects view, hover the mouse over them, and press \key Ctrl. + + \li To \l{Finding and Replacing}{search} through the output, press \key {Ctrl+F}. + + \li To make the font larger or smaller, select the \inlineimage icons/plus.png + and \inlineimage icons/minus.png + buttons. You can also change the font size in terminal preferences. + + \li To open terminal preferences, select \inlineimage icons/settings.png + (\uicontrol Configure). + \endlist + + Most of the \QC keyboard shortcuts are disabled in the terminal, except the + ones for opening terminal preferences or the locator and quitting \QC. To + send the escape key to the terminal instead of closing the terminal, select + \uicontrol {Shift+Esc}. You can also specify that the escape key is sent to + the terminal in terminal preferences. + + \section1 Terminal Preferences + + To set preferences for the internal terminal, select \uicontrol Edit > + \uicontrol Preferences > \uicontrol Terminal, or select the + \uicontrol Configure button in the \uicontrol Terminal pane. + + \image qtcreator-preferences-terminal.webp {Terminal tab in Preferences} + + \table + \header + \li Option + \li Value + \row + \li \uicontrol {Use internal terminal} + \li Open the \uicontrol Terminal pane when you select + \uicontrol {Run in Terminal} or \uicontrol {Open Terminal}. + \row + \li \uicontrol {Send escape key to terminal} + \li Send the escape key to the terminal instead of closing the terminal. + \row + \li \uicontrol {Audible bell} + \li Play an audible bell when the a bell character is received. + \row + \li \uicontrol {Allow blinking cursor} + \li Allow the cursor to blink. + \row + \li \uicontrol {Font} + \li Select the \uicontrol {Font family} and \uicontrol Size for the text + in the terminal. You can also use the \inlineimage icons/plus.png + and \inlineimage icons/minus.png buttons in the \uicontrol Terminal + pane to change the font size. + \row + \li \uicontrol {Colors} + \li Set colors for the \uicontrol Terminal pane \uicontrol Foreground, + \uicontrol Background, \uicontrol Selection, and + \uicontrol {Find match}. + \row + \li \uicontrol {Default shell} + \li Set the full path to the default terminal executable in + \uicontrol {Shell path} and the arguments to pass to the shell + in \uicontrol {Shell arguments}. + \endtable + + To use an existing color scheme, select \uicontrol {Load Theme}. To revert + color changes, select \uicontrol {Reset Theme}. + + \sa {View output} +*/ diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc new file mode 100644 index 00000000000..f8547ac3e1f --- /dev/null +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc @@ -0,0 +1,75 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \page creator-reference-to-do-entries-view.html + \previouspage creator-how-to-view-output.html + + \ingroup creator-reference-output-views + + \title To-Do Entries + + \brief Lists the BUG, FIXME, NOTE, TODO, and WARNING keywords from the + current file, from all project files, or from a subproject. + + Click the icons on the toolbar to show only the selected + keywords. + + \image qtcreator-to-do-entries.webp {To-Do Entries} + + You can also open task list files generated by code scanning and + analysis tools in \l Issues. For more information, see + \l{Showing Task List Files in Issues}. + + \section1 Enabling the To-Do Plugin + + The Todo plugin is disabled by default. To enable it: + + \list 1 + \li Select \uicontrol Help > \uicontrol {About Plugins} > + \uicontrol Utilities > \uicontrol Todo. + \li Select \uicontrol OK. + \li Select \uicontrol {Restart Now} to restart \QC and load the plugin. + \endlist + + \section1 To-Do Preferences + + To add keywords, select \uicontrol Edit > \uicontrol Preferences > + \uicontrol {To-Do} > \uicontrol Add. Set an icon and a line background color + for the keyword. + + \image qtcreator-todo-options.png {To-Do preferences} + + \list + + \li To change the icon and line background color of the selected keyword, + select \uicontrol Edit. + + \li To remove the selected keyword, select \uicontrol Remove. + + \li To reset the list to predefined keywords, select \uicontrol Reset. + All your changes will be permanently lost. + + \li To determine whether the keywords in the whole project, in the + current file, or in a subproject are displayed by default, select + the appropriate option in the \uicontrol {Scanning scope} group. + + \endlist + + \section1 Excluding Files from Scanning + + To exclude files from scanning, select \uicontrol {Project Settings} > + \uicontrol {To-Do} in the \uicontrol Projects mode. + + \image qtcreator-todo-excluded-files.png {Excluded Files in To-Do preferences} + + Select \uicontrol Add and double-click the placeholder text in + \uicontrol {Exclude Files} to enter a regular expression that + matches the path to files to exclude. Use a forward slash (/) + as a separator in the path also on Windows. + + Select the link in \uicontrol {Use global settings} to open global + To-Do preferences. + + \sa {Enable and disable plugins} +*/ diff --git a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc index c4e3d9e5692..72ac21121ed 100644 --- a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc @@ -9,7 +9,6 @@ \nextpage studio-content-library.html \else \previouspage creator-how-to-show-and-hide-sidebars.html - \nextpage creator-output-panes.html \endif \ingroup creator-reference-sidebar-views diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc index 1c3534afd13..be07f7f1580 100644 --- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc @@ -8,7 +8,6 @@ \nextpage creator-file-system-view.html \else \previouspage creator-how-to-show-and-hide-sidebars.html - \nextpage creator-output-panes.html \endif \ingroup creator-reference-sidebar-views diff --git a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc new file mode 100644 index 00000000000..42df7eb4d18 --- /dev/null +++ b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc @@ -0,0 +1,257 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +// ********************************************************************** +// NOTE: the sections are not ordered by their logical order to avoid +// reshuffling the file each time the index order changes (i.e., often). +// Run the fixnavi.pl script to adjust the links to the index order. +// ********************************************************************** + +/*! + \page creator-reference-issues-view.html + \previouspage creator-how-to-view-output.html + + \ingroup creator-reference-output-views + \ingroup studio-reference-output-views + + \title Issues + + \brief Lists issues from different sources. + + The \uicontrol Issues view filters out irrelevant output from the build tools + and presents the issues in an organized way. + + To further filter the output by type, select \inlineimage icons/filtericon.png + (\uicontrol {Filter Tree}) and then select a filter: + + \list + + \if defined(qtdesignstudio) + \li \uicontrol {Asset Export} - Errors and warnings encountered + while exporting assets. + + \li \uicontrol {Asset Importer Error} - Errors and warnings encountered + while importing assets from a design tool. + \else + \li \uicontrol Autotests - Errors and warnings encountered while running + tests. + \endif + + \li \uicontrol {Build System} - Errors and warnings encountered when + opening and managing projects. + + \if defined(qtcreator) + \li \uicontrol {Clang Code Model} - + \l {Parsing C++ Files with the Clang Code Model} + {Errors and warnings from the current editor}. + \li \uicontrol {Clang Tools} - Errors and warnings from + \l {Using Clang Tools}{Clang-Tidy and Clazy} + \endif + + \li \uicontrol Compile - Selected output from the compiler. Open + \uicontrol {Compile Output} for more detailed information. + + \li \uicontrol{Debug Information} - Lists debug information packages that might + be missing. + + \if defined(qtcreator) + \li \uicontrol Debugger - Errors encountered while running the + \l{Analyzing Code}{Valgrind code analysis tools}. + \endif + + \li \uicontrol{Debugger Runtime} - Errors encountered when starting \QC. For + example, information about missing DLLs. + + \li \uicontrol Deployment - Errors encountered between building an application + successfully and starting it on a \l{glossary-device}{device}. + + \if defined(qtcreator) + \li \uicontrol {My Tasks} - Entries from a task list file (.tasks) generated + by \l{Showing Task List Files in Issues} + {code scanning and analysis tools}. + + \li \uicontrol Python - Runtime errors and exceptions of Python scripts. + \endif + + \li \uicontrol QML and \uicontrol {QML Analysis} - + \l{JavaScript and QML Error Codes} + {QML and JavaScript syntax errors}. + + \if defined(qtcreator) + \li \uicontrol Sanitizer - Tasks created when you run an application if + you used an \e {address sanitizer} to detect memory handling issues. + \endif + \endlist + + To find output in the view, enter search criteria in the \uicontrol Filter + field. + + \image qtcreator-issues.webp {Issues} + + Select one or several lines to apply context-menu actions to their contents. + You can remove the selected lines or copy their contents to the clipboard. + For single lines, you can search the Internet for a solution using the + contents of the line as search criteria or open a version control + annotation view of the line that causes the error message. + + To view detailed information about the selected line (where available), press + \key Space. + + To navigate to the corresponding source code, click an issue or + select \uicontrol {Show in Editor} in the context menu. The entry must contain the + name of the file where the issue was found. + + To view more information about an issue in \l {Compile Output}, + select \uicontrol {Show Compile Output} in the context menu. + + To jump from one issue to the next or previous + one, select \inlineimage icons/arrowup.png + and \inlineimage icons/arrowdown.png + or press \key F6 and \key Shift+F6. + + By default, a new build clears the \uicontrol Issues view. To keep + the issues from the previous build rounds, deselect \uicontrol Edit > + \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General > + \uicontrol {Clear issues list on new build}. +*/ + +/*! + \page creator-reference-search-results-view.html + \previouspage creator-how-to-view-output.html + + \ingroup creator-reference-output-views + \ingroup studio-reference-output-views + + \title Search Results + + \brief Lets you search through projects, files on a file system or the + currently open files. + + The search history (1) stores the search results. You can select earlier + searches from the history. + + \image qtcreator-search-results.webp {Search Results - criteria} + + The figure below shows an example search result for all + occurrences of the search string in the specified directory. + + \image qtcreator-search-results-matches.webp {Search Results - matches found} + + For more information about the different search options, see + \l {Finding and Replacing}. +*/ + +/*! + \page creator-reference-application-output-view.html + \previouspage creator-how-to-view-output.html + + \ingroup creator-reference-output-views + \ingroup studio-reference-output-views + + \title Application Output + + \brief Displays the status of a program when you execute it, and the debug + output. + + \image qtcreator-application-output.webp {Application Output} + + \if defined(qtcreator) + If you specify command line arguments in the run settings that are passed + to the application when running it, they are displayed as a part of the + application output. For more information, see + \l{Specifying Run Settings for Desktop Device Types}. + \endif + + Select toolbar buttons to run applications, to attach the debugger to the + running application, and to stop running or debugging. + + \section1 Application Output Preferences + + To set preferences for displaying application output: + + \list + \li Select \uicontrol Edit > \uicontrol Preferences > + \uicontrol {Build & Run} > \uicontrol {Application Output}. + \li Select the \inlineimage icons/settings.png + (\uicontrol {Open Settings Page}) button. + \endlist + + \image qtcreator-preferences-application-output.webp {Application Output tab in Preferences} + + You can select whether to open \uicontrol{Application Output} on output when + running or debugging applications, to clear old output on a new run, + to word-wrap output, and to limit output to the specified number of lines. +*/ + +/*! + \page creator-reference-compile-output-view.html + \previouspage creator-how-to-view-output.html + + \ingroup creator-reference-output-views + \ingroup studio-reference-output-views + + \title Compile Output + + \brief Shows all output from the compiler. + + \uicontrol{Compile Output} shows a more detailed version of information + displayed in \l Issues. + + \image qtcreator-compile-output.webp {Compile Output} + + Double-click a file name in an error message to open the file in the + code editor. + + To cancel the build, select the \uicontrol {Cancel Build} button. + + To copy the output to the clipboard, select \uicontrol {Select All} in the + context menu, and then select \uicontrol Copy. Save the output as a file if + you want to examine it later without having to build the project again. + This is useful for large projects that take a long time to build. + + \section1 Compile Output Preferences + + To specify whether to open the \uicontrol {Compile Output} view on output + when building applications: + + \list 1 + \li Open the preferences: + \list + \li In the \uicontrol {Compile Output} view, + select \inlineimage icons/settings.png + (\uicontrol {Open Settings Page}). + \li Select \uicontrol Edit > \uicontrol Preferences > + \uicontrol {Build & Run} > \uicontrol {Compile Output}. + \endlist + \image qtcreator-preferences-compile-output.webp {Compile Output tab in Preferences} + \li Select the \uicontrol {Open Compile Output when building} check box. + \li In the \uicontrol {Limit output to} field, you can specify the + maximum amount of build output lines to display. + \endlist + + \section1 Parsing Existing Compile Output + + You can use \QC's output parsers to parse output from builds done outside + of \QC or stored from previous build runs. By default, the parsers from the + kit selected for the active project are used, but you can select another + kit. + + To parse compile output: + + \list 1 + \li Select \uicontrol Tools > \uicontrol {Parse Build Output}. + \image qtcreator-parse-build-output.png + \li Paste the build output in the \uicontrol {Build Output} field, or + select \uicontrol {Load from File} to load it from a file. + \li Deselect the \uicontrol {Output went to stderr} check box if the + parser expects issues on \c stdout. + \li In the \uicontrol {Use parsers from kit} field, select the kit to + use for parsing the output. Select \uicontrol Manage to view + and modify kit settings. + \li The parser displays the parsed output in \l Issues. By default, the + view is cleared before adding the new output. + Deselect the \uicontrol {Clear existing tasks} check box to append + the new output to the old output. + \li Select \uicontrol OK to start parsing. + \endlist +*/ diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc index a6fd8c45576..b37c1c4e0f7 100644 --- a/doc/qtcreator/src/user-interface/creator-ui.qdoc +++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc @@ -1,12 +1,6 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - /*! \page creator-quick-tour.html \if defined(qtdesignstudio) @@ -14,7 +8,7 @@ \nextpage creator-using-qt-quick-designer.html \else \previouspage creator-overview.html - \nextpage creator-views.html + \nextpage creator-configuring.html \endif \title User Interface @@ -66,7 +60,7 @@ \li \inlineimage numbers/07.png \li Output \li View output from building, running, and other actions. - \li \l{Viewing Output} + \li \l{View output} \endtable To see where the above controls are in the UI, select @@ -127,6 +121,7 @@ \li \l {Find menu items on \macos} \li \l {Set high DPI scaling} \li \l {Switch UI themes} + \li \l {View output} \endlist \section1 Viewing Images @@ -140,465 +135,3 @@ \endif */ - -/*! - \page creator-output-panes.html - \if defined(qtdesignstudio) - \previouspage creator-editor-functions.html - \nextpage creator-highlighting.html - \else - \previouspage creator-open-documents-view.html - \nextpage creator-configuring.html - \endif - - \title Viewing Output - - \image qtcreator-general-messages.webp {General Messages} - - You can view the following types of output: - - \list - - \li \l {Issues} - - \li \l {Search Results} - - \li \l {Application Output} - - \li \l {Compile Output} - - \if defined(qtcreator) - \li \l {Terminal} - \endif - - \li \uicontrol {QML Debugger Console} - - \li \uicontrol{General Messages} - - \if defined(qtcreator) - \li \l {Static Code Analysis}{Axivion} - \endif - - \li \uicontrol{Version Control} - - \if defined(qtcreator) - \li \l{Running Autotests}{Test Results} - - \li \l{Using Squish}{Squish} test results and Squish Server and - Runner logs - - \li \l {To-Do Entries} - - \endif - - \endlist - - Output is available on the taskbar in all - \if defined(qtcreator) - \l{Switch between modes}{modes}. - \else - \l{Mode}{modes}. - \endif - - \image qtcreator-output-panes-taskbar.webp "Output on the taskbar" - - You can view output in the following ways: - - \list - \li Select the output view on the taskbar. - \li Select \key Alt (\key Cmd on \macos) and the number of the view on - the taskbar. - \li Select \inlineimage icons/output-pane-menu.png - , and then select the view to open. - \li Select \uicontrol View > \uicontrol Output. - The menu items also display the \l{Keyboard Shortcuts} - {keyboard shortcuts} that you can use. - \endlist - - To maximize an open output view, select the \inlineimage icons/arrowup.png - (\uicontrol Maximize) button or press \key {Alt+Shift+9}. - - - To increase or decrease the output text size, select \inlineimage icons/plus.png - (\uicontrol {Zoom In}) or \inlineimage icons/minus.png - (\uicontrol {Zoom Out}), or press \key Ctrl++ or \key Ctrl+-. Zooming is - not supported in all output views. - - To open the \uicontrol{General Messages} and - \if defined(qtcreator) - \l{Using Version Control Systems}{Version Control} - \else - \l{Using Git}{Version Control} - \endif - views, select \uicontrol View > \uicontrol Output. - \if defined(qtcreator) - To view \uicontrol {To-Do Entries}, enable the \uicontrol Todo plugin. - \endif - - For more information about the \uicontrol {QML Debugger Console} view, see - \l{Executing JavaScript Expressions}. - - If the text in the output is not displayed correctly, \QC might - be using a different codec from the one used by the tools that generate - the output. To specify the codec to use, select \uicontrol Edit > - \uicontrol Preferences > \uicontrol Environment > \uicontrol Interface, and - then select the codec in the \uicontrol {Text codec for tools} field. - - \image qtcreator-preferences-environment-interface.webp {Interface tab in Environment preferences} - - \section1 Finding and Filtering Output - - To search from output, press \key {Ctrl+F} when the view is active. Enter - search criteria in the \uicontrol Find field. For more information, see - \l{Finding and Replacing}. - - Besides searching from the output, you can enter a string in the - \uicontrol Filter field to filter it. To specify filtering options, - select the \inlineimage icons/magnifier.png "Filtering options menu" - button. You can filter output by using regular expressions or - case-sensitivity. Select \uicontrol {Show Non-matching Lines} to - hide the lines that match the filter. - - Finding and filtering are not supported in all output views. - - \section1 Issues - - \uicontrol{Issues} lists the following types of issues: - - \list - - \if defined(qtdesignstudio) - \li \uicontrol {Asset Export} - Errors and warnings encountered - while exporting assets. - - \li \uicontrol {Asset Importer Error} - Errors and warnings encountered - while importing assets from a design tool. - \else - \li \uicontrol Autotests - Errors and warnings encountered while running - tests. - \endif - - \li \uicontrol {Build System} - Errors and warnings encountered during a - build. - - \if defined(qtcreator) - \li \uicontrol {Clang Code Model} - - \l {Parsing C++ Files with the Clang Code Model} - {Errors and warnings from the current editor}. - \li \uicontrol {Clang Tools} - Errors and warnings from - \l {Using Clang Tools}{Clang-Tidy and Clazy} - \endif - - \li \uicontrol Compile - Selected output from the compiler. Open - \uicontrol {Compile Output} for more detailed information. - - \li \uicontrol{Debug Information} - Lists debug information packages that might - be missing. - - \if defined(qtcreator) - \li \uicontrol Debugger - Errors encountered while running the - \l{Analyzing Code}{Valgrind code analysis tools}. - \endif - - \li \uicontrol{Debugger Runtime} - Errors encountered when starting \QC. For - example, information about missing DLLs. - - \li \uicontrol Deployment - Errors encountered between building an application - successfully and starting it on a \l{glossary-device}{device}. - - \if defined(qtcreator) - \li \uicontrol {My Tasks} - Entries from a task list file (.tasks) generated - by \l{Showing Task List Files in Issues} - {code scanning and analysis tools}. - - \li \uicontrol Python - Runtime errors and exceptions of Python scripts. - \endif - - \li \uicontrol QML and \uicontrol {QML Analysis} - - \l{JavaScript and QML Error Codes} - {QML and JavaScript syntax errors}. - - \if defined(qtcreator) - \li \uicontrol Sanitizer - Tasks created when you run an application if - you used an \e {address sanitizer} to detect memory handling issues. - \endif - \endlist - - The view filters out irrelevant output from the build tools and presents the - issues in an organized way. To further filter the output by type, select - \inlineimage icons/filtericon.png - (\uicontrol {Filter Tree}) and then select a filter. To find output in the - view, enter search criteria in the \uicontrol Filter field. - - \image qtcreator-issues.webp {Issues} - - Select one or several lines to apply context-menu actions to their contents. - You can remove the selected lines or copy their contents to the clipboard. - For single lines, you can search the Internet for a solution using the - contents of the line as search criteria or open a version control - annotation view of the line that causes the error message. - - To view detailed information about the selected line (where available), press - \key Space. - - To navigate to the corresponding source code, click an issue or - select \uicontrol {Show in Editor} in the context menu. The entry must contain the - name of the file where the issue was found. - - To view more information about an issue in \l {Compile Output}, - select \uicontrol {Show Compile Output} in the context menu. - - To jump from one issue to the next or previous - one, select \inlineimage icons/arrowup.png - and \inlineimage icons/arrowdown.png - or press \key F6 and \key Shift+F6. - - By default, a new build clears the \uicontrol Issues view. To keep - the issues from the previous build rounds, deselect \uicontrol Edit > - \uicontrol Preferences > \uicontrol {Build & Run} > \uicontrol General > - \uicontrol {Clear issues list on new build}. - - \section1 Search Results - - In \uicontrol{Search Results}, you can search through projects, files on - a file system or the currently open files: - - \image qtcreator-search-results.webp {Search Results - criteria} - - The search history (1) stores the search results. You can select earlier - searches from the history. - - The figure below shows an example search result for all - occurrences of the search string in the specified directory. - - \image qtcreator-search-results-matches.webp {Search Results - matches found} - - For more information about the different search options, see - \l {Finding and Replacing}. - - \section1 Application Output - - \uicontrol{Application Output} displays the status of a program when - you execute it, and the debug output. - - \image qtcreator-application-output.webp {Application Output} - - \if defined(qtcreator) - If you specify command line arguments in the run settings that are passed - to the application when running it, they are displayed as a part of the - application output. For more information, see - \l{Specifying Run Settings for Desktop Device Types}. - \endif - - Select toolbar buttons to run applications, to attach the debugger to the - running application, and to stop running or debugging. - - To specify settings for displaying application output, select - \uicontrol Edit > \uicontrol Preferences > \uicontrol {Build & Run} > - \uicontrol {Application Output}, or click the \inlineimage icons/settings.png - (\uicontrol {Open Settings Page}) button. You can select whether to open - \uicontrol{Application Output} on output when running or debugging - applications, to clear old output on a new run, - to word-wrap output, and to limit output to the specified number of lines. - - \section1 Compile Output - - \uicontrol{Compile Output} shows all output from the compiler. - The \uicontrol{Compile Output} is a more detailed version of information - displayed in \l Issues. - - \image qtcreator-compile-output.webp {Compile Output} - - Double-click on a file name in an error message to open the file in the - code editor. - - Select the \uicontrol {Cancel Build} button to cancel the build. - - To specify whether to open the \uicontrol {Compile Output} view on output - when building applications, select \uicontrol Edit > \uicontrol Preferences > - \uicontrol {Build & Run} > \uicontrol {Compile Output}, and then select the - \uicontrol {Open Compile Output when building} check box. - In the \uicontrol {Limit output to} field, you can specify the maximum - amount of build output lines to display. - - You can also open the preferences page by clicking \inlineimage icons/settings.png - (\uicontrol {Open Settings Page}). - - To copy the output to the clipboard, select \uicontrol {Select All} in the - context menu, and then select \uicontrol Copy. Save the output as a file if - you want to examine it later without having to build the project again. - This is useful for large projects that take a long time to build. - - \section2 Parsing Existing Compile Output - - You can use \QC's output parsers to parse output from builds done outside - of \QC or stored from previous build runs. By default, the parsers from the - kit selected for the active project are used, but you can select another - kit. - - To parse compile output: - - \list 1 - \li Select \uicontrol Tools > \uicontrol {Parse Build Output}. - \image qtcreator-parse-build-output.png - \li Paste the build output in the \uicontrol {Build Output} field, or - select \uicontrol {Load from File} to load it from a file. - \li Deselect the \uicontrol {Output went to stderr} check box if the - parser expects issues on \c stdout. - \li In the \uicontrol {Use parsers from kit} field, select the kit to - use for parsing the output. Select \uicontrol Manage to view - and modify kit settings. - \li The parser displays the parsed output in \l Issues. By default, the - view is cleared before adding the new output. - Deselect the \uicontrol {Clear existing tasks} check box to append - the new output to the old output. - \li Select \uicontrol OK to start parsing. - \endlist - - \if defined(qtcreator) - - \section1 Terminal - - When you select the \uicontrol {Run in Terminal} check box and run an - application or the \uicontrol {Open Terminal} button to open a terminal, - the default terminal opens. On Linux and \macos, you can set the default - terminal by selecting \uicontrol Edit > \uicontrol Preferences > - \uicontrol Environment > \uicontrol System. - - To open the terminal on the taskbar instead of in a separate window, select - \uicontrol Edit > \uicontrol Preferences > \uicontrol Terminal > - \uicontrol {Use internal terminal}. - - \image qtcreator-output-terminal.webp {Terminal pane} - - To clear the terminal, select \inlineimage icons/clean_pane_small.png - (\uicontrol Clear). - - To close the current terminal, select \inlineimage icons/terminal-close.png - . - - To open new terminals as tabs, select \inlineimage icons/terminal-create.png - . - - To move between terminals, select the tabs or \inlineimage icons/arrowup.png - and \inlineimage icons/arrowdown.png - . - - To select a word in a terminal, double-click it. To select the whole line, - triple-click it. - - To open links in a browser, files in the editor, or folders in the - \l Projects view, hover the mouse over them, and press \key Ctrl. - - To \l{Finding and Replacing}{search} through the output, press \key {Ctrl+F}. - - To make the font larger or smaller, select the \inlineimage icons/plus.png - and \inlineimage icons/minus.png - buttons. You can also change the font size in terminal preferences. - - To open terminal preferences, select \inlineimage icons/settings.png - (\uicontrol Configure). - - Most of the \QC keyboard shortcuts are disabled in the terminal, except the - ones for opening terminal preferences or the locator and quitting \QC. To - send the escape key to the terminal instead of closing the terminal, select - \uicontrol {Shift+Esc}. You can also specify that the escape key is sent to - the terminal in terminal preferences. - - \section2 Setting Terminal Preferences - - To set preferences for the internal terminal, select \uicontrol Edit > - \uicontrol Preferences > \uicontrol Terminal, or select the - \uicontrol Configure button in the \uicontrol Terminal pane. - - \image qtcreator-preferences-terminal.webp {Terminal tab in Preferences} - - \table - \header - \li Option - \li Value - \row - \li \uicontrol {Use internal terminal} - \li Open the \uicontrol Terminal pane when you select - \uicontrol {Run in Terminal} or \uicontrol {Open Terminal}. - \row - \li \uicontrol {Send escape key to terminal} - \li Send the escape key to the terminal instead of closing the terminal. - \row - \li \uicontrol {Audible bell} - \li Play an audible bell when the a bell character is received. - \row - \li \uicontrol {Allow blinking cursor} - \li Allow the cursor to blink. - \row - \li \uicontrol {Font} - \li Select the \uicontrol {Font family} and \uicontrol Size for the text - in the terminal. You can also use the \inlineimage icons/plus.png - and \inlineimage icons/minus.png buttons in the \uicontrol Terminal - pane to change the font size. - \row - \li \uicontrol {Colors} - \li Set colors for the \uicontrol Terminal pane \uicontrol Foreground, - \uicontrol Background, \uicontrol Selection, and - \uicontrol {Find match}. - \row - \li \uicontrol {Default shell} - \li Set the full path to the default terminal executable in - \uicontrol {Shell path} and the arguments to pass to the shell - in \uicontrol {Shell arguments}. - \endtable - - To use an existing color scheme, select \uicontrol {Load Theme}. To revert - color changes, select \uicontrol {Reset Theme}. - - \section1 To-Do Entries - - \uicontrol {To-Do Entries} lists the BUG, FIXME, NOTE, TODO, and - WARNING keywords from the current file, from all project files, or from a - subproject. Click the icons on the toolbar to show only the selected - keywords. - - \image qtcreator-to-do-entries.webp {To-Do Entries} - - To add keywords, select \uicontrol Edit > \uicontrol Preferences > - \uicontrol {To-Do} > \uicontrol Add. Set an icon and a line background color - for the keyword. - - \image qtcreator-todo-options.png {To-Do preferences} - - To change the icon and line background color of the selected keyword, select - \uicontrol Edit. - - To remove the selected keyword, select \uicontrol Remove. - - To reset the list to predefined keywords, select \uicontrol Reset. All your - changes will be permanently lost. - - To determine whether the keywords in the whole project, in the current file, - or in a subproject are displayed by default, select the appropriate option - in the \uicontrol {Scanning scope} group. - - To exclude files from scanning, select \uicontrol {Project Settings} > - \uicontrol {To-Do} in the \uicontrol Projects mode. - - \image qtcreator-todo-excluded-files.png {Excluded Files in To-Do preferences} - - Select \uicontrol Add and double-click the placeholder text in - \uicontrol {Exclude Files} to enter a regular expression that - matches the path to files to exclude. Use a forward slash (/) - as a separator in the path also on Windows. - - Select the link in \uicontrol {Use global settings} to open global - To-Do preferences. - - The Todo plugin is disabled by default. To enable the plugin, select - \uicontrol Help > \uicontrol {About Plugins} > \uicontrol Utilities > - \uicontrol Todo. Then select \uicontrol {Restart Now} to restart \QC - and load the plugin. - - In addition, you can open task list files generated by code scanning and - analysis tools in \l Issues. For more information, see - \l{Showing Task List Files in Issues}. - \endif - -*/ diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc index 52968f5b949..c458d5d0079 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-gitlab.qdoc @@ -20,7 +20,7 @@ To use GitLab, you must create a connection to the GitLab server and clone the projects you want to work on. You can also link previously cloned projects to GitLab in the project settings. This enables you to receive - event notifications in the \l {Viewing Output}{Version Control} pane. + event notifications in the \l {View output}{Version Control} pane. \section1 Connecting to GitLab Servers diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index 0f9f485b8c7..8b14e1a10af 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -200,7 +200,6 @@ \list \li \l{Writing Code} \list - \li \l{Viewing Output} \li \l{Semantic Highlighting} \li \l{Checking Code Syntax} \li \l{Completing Code} From 7a518dc1b8c26c5adbbd345852cede8d00453955 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 7 Jul 2023 14:48:41 +0200 Subject: [PATCH 054/101] Nim: Make the command information usable Change-Id: I68b7e589842f9cb3a423f2d81f9343ecd518f9db Reviewed-by: hjk --- src/plugins/nim/project/nimcompilerbuildstep.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index 588098619a2..76802a85df8 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -60,7 +60,7 @@ QWidget *NimCompilerBuildStep::createConfigWidget() auto additionalArgumentsLineEdit = new QLineEdit(widget); auto commandTextEdit = new QTextEdit(widget); - commandTextEdit->setEnabled(false); + commandTextEdit->setReadOnly(true); commandTextEdit->setMinimumSize(QSize(0, 0)); auto defaultArgumentsComboBox = new QComboBox(widget); From ba35a64d93e7d3edf847fde83cd529962e29ce4a Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 6 Jul 2023 10:37:09 +0200 Subject: [PATCH 055/101] ClangCodeModel: Remove dead code None of this had any affect after switching to clangd. Change-Id: I806682fecff84bf6eb0b0eb382e096fc9a25fa3d Reviewed-by: David Schulz --- .../clangeditordocumentprocessor.cpp | 20 ------- .../clangeditordocumentprocessor.h | 8 --- .../clangmodelmanagersupport.cpp | 52 +------------------ .../clangcodemodel/clangmodelmanagersupport.h | 4 -- 4 files changed, 1 insertion(+), 83 deletions(-) diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp index 687758bb0ae..d7c94d81247 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp @@ -59,26 +59,6 @@ void ClangEditorDocumentProcessor::semanticRehighlight() BuiltinEditorDocumentProcessor::semanticRehighlight(); } -bool ClangEditorDocumentProcessor::hasProjectPart() const -{ - return !m_projectPart.isNull(); -} - -CppEditor::ProjectPart::ConstPtr ClangEditorDocumentProcessor::projectPart() const -{ - return m_projectPart; -} - -void ClangEditorDocumentProcessor::clearProjectPart() -{ - m_projectPart.clear(); -} - -::Utils::Id ClangEditorDocumentProcessor::diagnosticConfigId() const -{ - return m_diagnosticConfigId; -} - void ClangEditorDocumentProcessor::setParserConfig( const CppEditor::BaseEditorDocumentParser::Configuration &config) { diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h index aefbaa9e0ff..bd151554003 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h @@ -19,12 +19,6 @@ public: void semanticRehighlight() override; - bool hasProjectPart() const; - CppEditor::ProjectPart::ConstPtr projectPart() const; - void clearProjectPart(); - - ::Utils::Id diagnosticConfigId() const; - void setParserConfig(const CppEditor::BaseEditorDocumentParser::Configuration &config) override; CppEditor::BaseEditorDocumentParser::Configuration parserConfig(); @@ -37,8 +31,6 @@ signals: private: TextEditor::TextDocument &m_document; - CppEditor::ProjectPart::ConstPtr m_projectPart; - ::Utils::Id m_diagnosticConfigId; }; } // namespace Internal diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp index a14fb81b901..98e855b4195 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp @@ -232,9 +232,7 @@ ClangModelManagerSupport::ClangModelManagerSupport() connect(modelManager, &CppModelManager::abstractEditorSupportRemoved, this, &ClangModelManagerSupport::onAbstractEditorSupportRemoved); connect(modelManager, &CppModelManager::projectPartsUpdated, - this, &ClangModelManagerSupport::onProjectPartsUpdated); - connect(modelManager, &CppModelManager::projectPartsRemoved, - this, &ClangModelManagerSupport::onProjectPartsRemoved); + this, &ClangModelManagerSupport::updateLanguageClient); connect(modelManager, &CppModelManager::fallbackProjectPartUpdated, this, [this] { if (sessionModeEnabled()) return; @@ -861,37 +859,6 @@ void ClangModelManagerSupport::onTextMarkContextMenuRequested(TextEditor::TextEd } } -using ClangEditorDocumentProcessors = QVector; -static ClangEditorDocumentProcessors clangProcessors() -{ - ClangEditorDocumentProcessors result; - for (const CppEditorDocumentHandle *editorDocument : cppModelManager()->cppEditorDocuments()) - result.append(qobject_cast(editorDocument->processor())); - - return result; -} - -void ClangModelManagerSupport::onProjectPartsUpdated(Project *project) -{ - QTC_ASSERT(project, return); - - updateLanguageClient(project); - - QStringList projectPartIds; - const ProjectInfo::ConstPtr projectInfo = cppModelManager()->projectInfo(project); - QTC_ASSERT(projectInfo, return); - - for (const ProjectPart::ConstPtr &projectPart : projectInfo->projectParts()) - projectPartIds.append(projectPart->id()); - onProjectPartsRemoved(projectPartIds); -} - -void ClangModelManagerSupport::onProjectPartsRemoved(const QStringList &projectPartIds) -{ - if (!projectPartIds.isEmpty()) - reinitializeBackendDocuments(projectPartIds); -} - void ClangModelManagerSupport::onClangdSettingsChanged() { const bool sessionMode = sessionModeEnabled(); @@ -940,21 +907,4 @@ void ClangModelManagerSupport::onClangdSettingsChanged() } } -static ClangEditorDocumentProcessors -clangProcessorsWithProjectParts(const QStringList &projectPartIds) -{ - return ::Utils::filtered(clangProcessors(), [projectPartIds](ClangEditorDocumentProcessor *p) { - return p->hasProjectPart() && projectPartIds.contains(p->projectPart()->id()); - }); -} - -void ClangModelManagerSupport::reinitializeBackendDocuments(const QStringList &projectPartIds) -{ - const ClangEditorDocumentProcessors processors = clangProcessorsWithProjectParts(projectPartIds); - for (ClangEditorDocumentProcessor *processor : processors) { - processor->clearProjectPart(); - processor->run(); - } -} - } // ClangCodeModel::Internal diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h index 140239550d8..8121b9967a9 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h @@ -81,12 +81,8 @@ private: int lineNumber, QMenu *menu); - void onProjectPartsUpdated(ProjectExplorer::Project *project); - void onProjectPartsRemoved(const QStringList &projectPartIds); void onClangdSettingsChanged(); - void reinitializeBackendDocuments(const QStringList &projectPartIds); - void connectTextDocumentToTranslationUnit(TextEditor::TextDocument *textDocument); void connectToWidgetsMarkContextMenuRequested(QWidget *editorWidget); From 3745394fde2945359777aff7e0bcecb88dfa36fd Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 9 Jul 2023 09:49:57 +0300 Subject: [PATCH 056/101] Bump version to 11.0.0 Change-Id: Id20c9efb437a919d5d8a2f97b873f21468b0c5d9 Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 6 +++--- qbs/modules/qtc/qtc.qbs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 8f985e5986b..42ad51bcfd6 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -set(IDE_VERSION "10.0.84") # The IDE version. -set(IDE_VERSION_COMPAT "10.0.84") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "11.0.0-rc1") # The IDE display version. +set(IDE_VERSION "11.0.0") # The IDE version. +set(IDE_VERSION_COMPAT "11.0.0") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "11.0.0") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2023") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 01dd13cc9de..c2557d15af5 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -6,16 +6,16 @@ import qbs.Utilities Module { Depends { name: "cpp"; required: false } - property string qtcreator_display_version: '11.0.0-rc1' - property string ide_version_major: '10' + property string qtcreator_display_version: '11.0.0' + property string ide_version_major: '11' property string ide_version_minor: '0' - property string ide_version_release: '84' + property string ide_version_release: '0' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release - property string ide_compat_version_major: '10' + property string ide_compat_version_major: '11' property string ide_compat_version_minor: '0' - property string ide_compat_version_release: '84' + property string ide_compat_version_release: '0' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release From d4260dab855d8d52fbd04f5be400fe30bd302415 Mon Sep 17 00:00:00 2001 From: Alexis Jeandet Date: Mon, 10 Jul 2023 13:05:52 +0200 Subject: [PATCH 057/101] Ensure that target name is relative to build dir and without leading '/' Fixes: QTCREATORBUG-29349 Change-Id: I7471242cd422a68a2652ff23741d0615380e2e8d Reviewed-by: hjk Reviewed-by: Eike Ziller --- .../mesonprojectmanager/mesonprojectparser.cpp | 6 +++--- src/plugins/mesonprojectmanager/target.h | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp index c84b5e4b3d6..528865f3d37 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp +++ b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp @@ -183,7 +183,7 @@ QList MesonProjectParser::appsTargets() const if (target.type == Target::Type::executable) { ProjectExplorer::BuildTargetInfo bti; bti.displayName = target.name; - bti.buildKey = Target::fullName(m_srcDir, target); + bti.buildKey = Target::fullName(m_buildDir, target); bti.displayNameUniquifier = bti.buildKey; bti.targetFilePath = Utils::FilePath::fromString(target.fileName.first()); bti.workingDirectory = Utils::FilePath::fromString(target.fileName.first()).absolutePath(); @@ -237,7 +237,7 @@ void MesonProjectParser::update(const QFuture m_rootNode = std::move(parserData->rootNode); m_targetsNames.clear(); for (const Target &target : m_parserResult.targets) { - m_targetsNames.push_back(Target::fullName(m_srcDir, target)); + m_targetsNames.push_back(Target::fullName(m_buildDir, target)); } addMissingTargets(m_targetsNames); m_targetsNames.sort(); @@ -253,7 +253,7 @@ ProjectExplorer::RawProjectPart MesonProjectParser::buildRawPart( { ProjectExplorer::RawProjectPart part; part.setDisplayName(target.name); - part.setBuildSystemTarget(Target::fullName(m_srcDir, target)); + part.setBuildSystemTarget(Target::fullName(m_buildDir, target)); part.setFiles(sources.sources + sources.generatedSources); auto flags = splitArgs(sources.parameters); part.setMacros(flags.macros); diff --git a/src/plugins/mesonprojectmanager/target.h b/src/plugins/mesonprojectmanager/target.h index 1efa3669490..b48c79e7c70 100644 --- a/src/plugins/mesonprojectmanager/target.h +++ b/src/plugins/mesonprojectmanager/target.h @@ -60,15 +60,17 @@ struct Target const std::optional subproject; const SourceGroupList sources; - static inline QString fullName(const Utils::FilePath &srcDir, const Target &target) + static inline QString fullName(const Utils::FilePath &buildDir, const Target &target) { using namespace Utils; - if (FilePath::fromString((target.fileName.first())).isAbsolutePath()) { - const auto fname = target.fileName.first().split('/').last(); - QString definedIn = FilePath::fromString(target.definedIn).absolutePath().toString(); - return definedIn.remove(srcDir.toString()) + '/' + fname; + auto fname = target.fileName.first(); + if (FilePath::fromString(fname).isAbsolutePath()) { + fname.remove(buildDir.toString()); + if (fname.startsWith('/')) + fname.removeFirst(); + return fname; } else { - return target.fileName.first(); + return fname; } } From fdf79f0234792c3225779ef0bbed8fe4866266d3 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 10 Jul 2023 15:53:38 +0200 Subject: [PATCH 058/101] AutoTest: Avoid crash on concurrent access Partially reverts 91bdbb61eccdde5e1c228281f7335685b22aa7f6 as the symbol lookup will update the snapshot's cache. As there are concurrent threads accessing the snapshot we may end up in a crash. Change-Id: I2aaf5e403b10cba2b26915cbe7b4712c43c4957b Reviewed-by: Marcus Tillmanns --- src/plugins/autotest/qtest/qttestvisitors.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/autotest/qtest/qttestvisitors.h b/src/plugins/autotest/qtest/qttestvisitors.h index 756ba17b9e2..dc18914b544 100644 --- a/src/plugins/autotest/qtest/qttestvisitors.h +++ b/src/plugins/autotest/qtest/qttestvisitors.h @@ -34,7 +34,7 @@ public: private: CppEditor::SymbolFinder m_symbolFinder; QString m_className; - const CPlusPlus::Snapshot &m_snapshot; + CPlusPlus::Snapshot m_snapshot; QMap m_privSlots; bool m_valid = false; bool m_inherited = false; From f2c96b4c4c94f438c5f9353fe43e27c79a9bfbfd Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 11 Jul 2023 07:34:24 +0200 Subject: [PATCH 059/101] MesonPM: Fix compile before Qt6.5 Amends d4260dab855. Change-Id: Ifa5976002d8bdd39f3742e24be20b40b04067e7f Reviewed-by: Eike Ziller --- src/plugins/mesonprojectmanager/target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/mesonprojectmanager/target.h b/src/plugins/mesonprojectmanager/target.h index b48c79e7c70..bc137eee90a 100644 --- a/src/plugins/mesonprojectmanager/target.h +++ b/src/plugins/mesonprojectmanager/target.h @@ -67,7 +67,7 @@ struct Target if (FilePath::fromString(fname).isAbsolutePath()) { fname.remove(buildDir.toString()); if (fname.startsWith('/')) - fname.removeFirst(); + fname.remove(0, 1); return fname; } else { return fname; From 31386c3fa0ae6b8fc7afef9a35049d6af42b2889 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 7 Jul 2023 12:17:51 +0200 Subject: [PATCH 060/101] Doc: Add a Reference topic For listing reference topics. Task-number: QTCREATORBUG-29361 Change-Id: I1d0463c4bfcd826464535a377da533509d838435 Reviewed-by: Eike Ziller --- doc/qtcreator/config/style/qt5-sidebar.html | 3 +- .../src/howto/creator-how-to-macos.qdoc | 2 +- .../creator-how-to-set-high-dpi-scaling.qdoc | 2 +- .../creator-how-to-switch-ui-themes.qdoc | 2 +- .../src/howto/creator-how-to-view-images.qdoc | 4 +-- .../src/howto/creator-keyboard-shortcuts.qdoc | 6 ++-- .../creator-how-to-enable-plugins.qdoc | 2 +- .../creator-how-to-find-settings-files.qdoc | 2 +- .../creator-how-to-install-plugins.qdoc | 2 +- .../howto/creator-only/creator-how-tos.qdoc | 36 +++++++++---------- .../creator-only/creator-reference.qdoc | 22 ++++++++++++ doc/qtcreator/src/qtcreator-toc.qdoc | 1 + doc/qtcreator/src/qtcreator.qdoc | 1 + .../creator-file-system-view.qdoc | 2 +- .../creator-how-to-view-output.qdoc | 6 ++-- ...creator-how-to-show-and-hide-sidebars.qdoc | 10 ++---- .../creator-how-to-switch-between-modes.qdoc | 2 +- .../creator-reference-sidebar-views.qdoc | 10 +++--- .../creator-reference-terminal-view.qdoc | 2 +- .../creator-reference-to-do-entries-view.qdoc | 2 +- .../creator-open-documents-view.qdoc | 2 +- .../user-interface/creator-projects-view.qdoc | 2 +- .../creator-reference-output-views.qdoc | 8 ++--- .../src/user-interface/creator-ui.qdoc | 2 +- 24 files changed, 77 insertions(+), 56 deletions(-) create mode 100644 doc/qtcreator/src/overview/creator-only/creator-reference.qdoc diff --git a/doc/qtcreator/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html index 48111154eb8..9f272e3a7a8 100644 --- a/doc/qtcreator/config/style/qt5-sidebar.html +++ b/doc/qtcreator/config/style/qt5-sidebar.html @@ -101,7 +101,8 @@
  • Using the Help Mode
  • FAQ
    • -
  • How-tos
    • +
  • How-to
    • +
  • Reference
  • Known Issues
  • Glossary
  • Technical Support
    • diff --git a/doc/qtcreator/src/howto/creator-how-to-macos.qdoc b/doc/qtcreator/src/howto/creator-how-to-macos.qdoc index 166fb4517af..639fb08f27f 100644 --- a/doc/qtcreator/src/howto/creator-how-to-macos.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-macos.qdoc @@ -5,7 +5,7 @@ \page creator-how-to-macos.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui \ingroup studio-how-to diff --git a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc index 849a4dbff52..a52be5210fb 100644 --- a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc @@ -5,7 +5,7 @@ \page creator-how-to-set-high-dpi-scaling.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui \ingroup studio-how-to diff --git a/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc b/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc index c03a50cf930..69fd7efef26 100644 --- a/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc @@ -5,7 +5,7 @@ \page creator-how-to-switch-ui-themes.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui \ingroup studio-how-to diff --git a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc index 0671ed9980c..c6532aa8029 100644 --- a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc @@ -5,7 +5,7 @@ \page creator-how-to-view-images.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-design \ingroup studio-how-to-image-viewer @@ -47,7 +47,7 @@ \page creator-how-to-export-svg-images.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-design \ingroup studio-how-to-image-viewer diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc index e16644c430d..8efe6c1324b 100644 --- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc @@ -793,7 +793,7 @@ \nextpage studio-projects.html \else \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui @@ -854,7 +854,7 @@ \nextpage studio-projects.html \else \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui @@ -888,7 +888,7 @@ \nextpage studio-projects.html \else \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \title Import and export keyboard shortcuts diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc index f47ccc30c34..6cf11eff11f 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-enable-plugins.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-use \title Enable and disable plugins diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc index 42cb4759648..8bfb773a402 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-find-settings-files.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-use \title Find settings files diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc index 10eb5e36c45..711e036c519 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-install-plugins.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-use \title Install plugins diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc index c59902f3b04..9e2dc2afc40 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc @@ -10,7 +10,7 @@ /*! \previouspage creator-faq.html \page creator-how-tos.html - \nextpage creator-known-issues.html + \nextpage creator-reference.html \title How-to @@ -76,7 +76,7 @@ /*! \page creator-how-to-move-between-open-files.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Move between open files @@ -96,7 +96,7 @@ /*! \page creator-how-to-switch-to-edit-mode.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Switch to Edit mode @@ -118,7 +118,7 @@ /*! \page creator-how-to-find-preferences.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-ui \title Find a particular preference @@ -132,7 +132,7 @@ /*! \page creator-how-to-run-from-cli.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-use \title Run \QC from the command line @@ -150,7 +150,7 @@ /*! \page creator-how-to-move-to-symbols.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Move to symbols @@ -173,7 +173,7 @@ /*! \page creator-how-to-locate-files-using-keyboard.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Locate files using the keyboard @@ -198,7 +198,7 @@ /*! \page creator-how-to-perform-calculations.html \previouspage creator-how-to-move-between-open-files.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Perform calculations @@ -215,7 +215,7 @@ /*! \page creator-how-to-jump-to-functions-in-qml-code.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Jump to a function in QML code @@ -227,7 +227,7 @@ /*! \page creator-how-to-add-license-header-templates.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-projects \title Add a license header template for C++ code @@ -258,7 +258,7 @@ /*! \page creator-how-to-paste-text-from-clipboard-history.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Paste text from clipboard history @@ -271,7 +271,7 @@ /*! \page creator-how-to-sort-lines-alphabetically.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Sort lines alphabetically @@ -284,7 +284,7 @@ /*! \page creator-enclose-code-in-characters.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Enclose selected code in curly braces, parentheses, or double quotes @@ -309,7 +309,7 @@ /*! \page creator-how-to-select-enclosing-block.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Select the enclosing block in C++ @@ -320,7 +320,7 @@ /*! \page creator-how-to-add-code-snippets.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Add code snippets to the auto-complete menu @@ -337,7 +337,7 @@ /*! \page creator-how-to-write-notes.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Write down notes @@ -366,7 +366,7 @@ /*! \page creator-how-to-set-recent-files.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-ui \title Set the number of recent files shown @@ -386,7 +386,7 @@ /*! \page creator-how-to-search-and-replace-using-regexp.html \previouspage creator-how-to-move-between-open-files.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Search and replace across files using a regular expression diff --git a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc new file mode 100644 index 00000000000..22dfff65739 --- /dev/null +++ b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc @@ -0,0 +1,22 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \page creator-reference.html + \previouspage creator-how-tos.html + \nextpage creator-known-issues.html + + \title Reference + + The following topics describe the different parts of the UI in detail. + + \section1 Sidebar Views + + \annotatedlist creator-reference-sidebar-views + + \section1 Output Views + + \annotatedlist creator-reference-output-views + + \sa {User Interface}, {Show and hide sidebars}, {View output} +*/ diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index da6f5444c50..3874d687a91 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -239,6 +239,7 @@ \li \l{Using the Help Mode} \li \l{FAQ} \li \l{How-to} + \li \l{Reference} \li \l{Known Issues} \li \l{Glossary} \li \l{Technical Support} diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc index 60f61a9561c..d1aba95665d 100644 --- a/doc/qtcreator/src/qtcreator.qdoc +++ b/doc/qtcreator/src/qtcreator.qdoc @@ -104,6 +104,7 @@ \li \l{Using the Help Mode} \li \l{FAQ} \li \l{How-to} + \li \l{Reference} \li \l{Known Issues} \li \l{Glossary} \endlist diff --git a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc index 26a7472500c..b2a9f0dfe1d 100644 --- a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc @@ -7,7 +7,7 @@ \previouspage creator-projects-view.html \nextpage creator-open-documents-view.html \else - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \endif \ingroup creator-reference-sidebar-views diff --git a/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc index 2121bd247a2..db90bb39f0b 100644 --- a/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc +++ b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc @@ -73,13 +73,13 @@ Some output views do not support finding and filtering. + \if defined(qtcreator) + \sa {Output Views} + \else \section1 Output views The following views show output: - \if defined(qtcreator) - \annotatedlist creator-reference-output-views - \else \annotatedlist studio-reference-output-views \endif */ diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc index 71105caadf9..52ecb03c011 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-show-and-hide-sidebars.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-ui \title Show and hide sidebars @@ -32,12 +32,8 @@ (\uicontrol {Close}). \endlist - \section1 Sidebar views - - Manage projects and files in the following views: - - \annotatedlist creator-reference-sidebar-views - In some views, right-clicking opens a context menu that has functions for managing the objects listed in the view. + + \sa {Sidebar Views} */ diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc index a43cffc4f04..fb023f1f3c1 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-switch-between-modes.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-ui \title Switch between modes diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc index ca147e76dcf..ef50387b4fc 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc @@ -3,7 +3,7 @@ /*! \page creator-outline-view.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Outline @@ -31,7 +31,7 @@ /*! \page creator-class-view.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Class View @@ -51,7 +51,7 @@ /*! \page creator-call-hierarchy-view.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Call Hierarchy @@ -73,7 +73,7 @@ /*! \page creator-type-hierarchy.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Type Hierarchy @@ -105,7 +105,7 @@ /*! \page creator-include-hierarchy-view.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Include Hierarchy diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc index a87ec969c80..abfae8ba8b2 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc @@ -3,7 +3,7 @@ /*! \page creator-reference-terminal-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc index f8547ac3e1f..fb1b40f2633 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc @@ -3,7 +3,7 @@ /*! \page creator-reference-to-do-entries-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views diff --git a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc index 72ac21121ed..0ad0967dc0c 100644 --- a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc @@ -8,7 +8,7 @@ \previouspage creator-file-system-view.html \nextpage studio-content-library.html \else - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \endif \ingroup creator-reference-sidebar-views diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc index be07f7f1580..529abfed348 100644 --- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc @@ -7,7 +7,7 @@ \previouspage qtquick-curve-editor.html \nextpage creator-file-system-view.html \else - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \endif \ingroup creator-reference-sidebar-views diff --git a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc index 42df7eb4d18..60387532f7e 100644 --- a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc +++ b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc @@ -9,7 +9,7 @@ /*! \page creator-reference-issues-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views \ingroup studio-reference-output-views @@ -117,7 +117,7 @@ /*! \page creator-reference-search-results-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views \ingroup studio-reference-output-views @@ -143,7 +143,7 @@ /*! \page creator-reference-application-output-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views \ingroup studio-reference-output-views @@ -185,7 +185,7 @@ /*! \page creator-reference-compile-output-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views \ingroup studio-reference-output-views diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc index b37c1c4e0f7..220d9af132a 100644 --- a/doc/qtcreator/src/user-interface/creator-ui.qdoc +++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc @@ -76,7 +76,7 @@ For information about new features and bug fixes in each \QC release, select \uicontrol Help > \uicontrol {Change Log}. - \sa {Use the UI}{How-to: Use the UI} + \sa {Use the UI}{How-to: Use the UI}, {Reference} \else From 4f50b6b791e1988bfb10f113baf0d94cc7e046cb Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 10 Jul 2023 12:59:00 +0200 Subject: [PATCH 061/101] AutoTest: Postpone removal of root node If a root node should get removed while scanning we may end up crashing when still getting results. As there is currently no mechanism to stop a certain parser postpone the removal of the root node until the parsing is done. Change-Id: I3766f9e67780e241801166339fa67f39536314b4 Reviewed-by: Marcus Tillmanns --- src/plugins/autotest/testprojectsettings.cpp | 6 +++++- src/plugins/autotest/testtreeitem.cpp | 11 ++++++++--- src/plugins/autotest/testtreeitem.h | 1 + src/plugins/autotest/testtreemodel.cpp | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/plugins/autotest/testprojectsettings.cpp b/src/plugins/autotest/testprojectsettings.cpp index 5f745637db8..dd0c05079cc 100644 --- a/src/plugins/autotest/testprojectsettings.cpp +++ b/src/plugins/autotest/testprojectsettings.cpp @@ -4,7 +4,9 @@ #include "testprojectsettings.h" #include "autotestconstants.h" +#include "testcodeparser.h" #include "testframeworkmanager.h" +#include "testtreemodel.h" #include #include @@ -49,7 +51,9 @@ void TestProjectSettings::activateFramework(const Id &id, bool activate) { ITestFramework *framework = TestFrameworkManager::frameworkForId(id); m_activeTestFrameworks[framework] = activate; - if (!activate) + if (TestTreeModel::instance()->parser()->isParsing()) + framework->rootNode()->markForRemoval(!activate); + else if (!activate) framework->resetRootNode(); } diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp index f18adb812d4..69481b60cad 100644 --- a/src/plugins/autotest/testtreeitem.cpp +++ b/src/plugins/autotest/testtreeitem.cpp @@ -214,12 +214,16 @@ bool TestTreeItem::modifyLineAndColumn(const TestParseResult *result) void TestTreeItem::markForRemoval(bool mark) { - m_status = mark ? MarkedForRemoval : Cleared; + if (type() == Root) + m_status = mark ? ForcedRootRemoval : NewlyAdded; + else + m_status = mark ? MarkedForRemoval : Cleared; } void TestTreeItem::markForRemovalRecursively(bool mark) { - markForRemoval(mark); + if (type() != Root) + markForRemoval(mark); for (int row = 0, count = childCount(); row < count; ++row) childItem(row)->markForRemovalRecursively(mark); } @@ -231,7 +235,8 @@ void TestTreeItem::markForRemovalRecursively(const QSet &filePaths) child->markForRemovalRecursively(filePaths); mark &= child->markedForRemoval(); }); - markForRemoval(mark); + if (type() != Root) + markForRemoval(mark); } TestTreeItem *TestTreeItem::childItem(int at) const diff --git a/src/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h index 3737d2a3607..4f4065c62d8 100644 --- a/src/plugins/autotest/testtreeitem.h +++ b/src/plugins/autotest/testtreeitem.h @@ -167,6 +167,7 @@ private: { NewlyAdded, MarkedForRemoval, + ForcedRootRemoval, // only valid on rootNode Cleared }; diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index 5e7fcb85a86..7d0dd3954d0 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -485,6 +485,10 @@ void TestTreeModel::markForRemoval(const QSet &filePaths) void TestTreeModel::sweep() { for (TestTreeItem *frameworkRoot : frameworkRootNodes()) { + if (frameworkRoot->m_status == TestTreeItem::ForcedRootRemoval) { + frameworkRoot->framework()->resetRootNode(); + continue; + } sweepChildren(frameworkRoot); revalidateCheckState(frameworkRoot); } From b5fa6be3624ee79eb9e4f30dec729c5e8455c5dc Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 11 Jul 2023 11:03:15 +0200 Subject: [PATCH 062/101] AutoTest: Retrigger scan if active frameworks change ...if the code parser is scanning for tests. Otherwise we have the canceled state of the running scan. Change-Id: Ief493c0bf66825e57c44c79193d5e8085ee98acd Reviewed-by: Marcus Tillmanns --- src/plugins/autotest/testcodeparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp index e78be579651..dc76520dd3a 100644 --- a/src/plugins/autotest/testcodeparser.cpp +++ b/src/plugins/autotest/testcodeparser.cpp @@ -92,7 +92,7 @@ void TestCodeParser::syncTestFrameworks(const QList &parsers) { if (m_parserState != Idle) { // there's a running parse - m_postponedUpdateType = UpdateType::NoUpdate; + m_postponedUpdateType = UpdateType::FullUpdate; m_postponedFiles.clear(); ProgressManager::cancelTasks(Constants::TASK_PARSE); } From 409591e6f9accd837bbd13898636cc7b51468713 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 11 Jul 2023 11:08:34 +0200 Subject: [PATCH 063/101] MCU: Fix missing files in list of project files MCU projects contain subnodes for the contents of QmlProject files, which get populated after the project tree was already added to the tree. To make sure that the added files are also listed in `Project::files(...)`, and therefore be considered for e.g. Locator and project searches, the code must trigger `Project::handleSubTreeChanged`, so the cached list of nodes is updated. This doesn't happen with `addNode` (which is for construction before the tree is added to the `ProjectTree`), and forcing the `ProjectTree::emitSubtreeChanged` signal is also not sufficient. Use `FolderNode::replaceSubtree` which was made for this usecase and triggers all the relevant code. Fixes: QTCREATORBUG-29297 Change-Id: I3a1c4c1aebf978e2788de905231b83355db75030 Reviewed-by: Reviewed-by: Yasser Grimes Reviewed-by: Christian Kandeler --- src/plugins/mcusupport/mcusupportplugin.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp index f0726e3895f..05f457689d8 100644 --- a/src/plugins/mcusupport/mcusupportplugin.cpp +++ b/src/plugins/mcusupport/mcusupportplugin.cpp @@ -89,9 +89,7 @@ void updateMCUProjectTree(ProjectExplorer::Project *p) auto qmlProjectNode = std::make_unique(FilePath(node->filePath()), inputsJsonFile); - auto qmlProjectNodePtr = qmlProjectNode.get(); - const_cast(node)->addNode(std::move(qmlProjectNode)); - ProjectExplorer::ProjectTree::emitSubtreeChanged(qmlProjectNodePtr); + const_cast(node)->replaceSubtree(nullptr, std::move(qmlProjectNode)); }); }; From 3224743a1c09107652fc916a2fdf227076647a9b Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 11 Jul 2023 16:09:24 +0200 Subject: [PATCH 064/101] Doc: Move Qt Designer keyboard shortcuts to their own section They were mixed with Editor shortcuts. Fixes: QTCREATORBUG-29399 Change-Id: I5f81e1c32cabd7f94bb0d2adef29ff8a0d5ca748 Reviewed-by: Reviewed-by: Eike Ziller --- .../src/howto/creator-keyboard-shortcuts.qdoc | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc index 8efe6c1324b..878a0f6cca6 100644 --- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc @@ -344,25 +344,7 @@ \row \li Visualize whitespace \li Ctrl+E, Ctrl+V - \row - \li Adjust size - \li Ctrl+J - \row - \li Lay out in a grid - \li Ctrl+G - \row - \li Lay out horizontally - \li Ctrl+H - \row - \li Lay out vertically - \li Ctrl+L - \row - \li Preview - \li Alt+Shift+R \if defined(qtcreator) - \row - \li Edit signals and slots - \li F4 \row \li Toggle bookmark \li Ctrl+M @@ -498,6 +480,32 @@ \li Yank \endlist + \section1 \QD Shortcuts + + \table + \header + \li Action + \li Keyboard shortcut + \row + \li Adjust size + \li Ctrl+J + \row + \li Lay out in a grid + \li Ctrl+G + \row + \li Lay out horizontally + \li Ctrl+H + \row + \li Lay out vertically + \li Ctrl+L + \row + \li Preview + \li Alt+Shift+R + \row + \li Edit signals and slots + \li F4 + \endtable + \section1 Image Viewer Shortcuts \table From 9e8bdc983645700d7140f30df87aaca1c3143e2a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 12 Jul 2023 10:03:31 +0200 Subject: [PATCH 065/101] Fix order of session vs recent files/projects menu Got mixed up when moving the session manager to Core Change-Id: I729dd505c0b58bbbe46ddee423c76ab21c6f1b25 Reviewed-by: Christian Kandeler --- src/plugins/coreplugin/coreconstants.h | 1 + src/plugins/coreplugin/mainwindow.cpp | 1 + src/plugins/coreplugin/session.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 513d02eb6ee..2606628d266 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -143,6 +143,7 @@ const char G_HELP[] = "QtCreator.Group.Help"; // File menu groups const char G_FILE_NEW[] = "QtCreator.Group.File.New"; const char G_FILE_OPEN[] = "QtCreator.Group.File.Open"; +const char G_FILE_SESSION[] = "QtCreator.Group.File.Recent"; const char G_FILE_PROJECT[] = "QtCreator.Group.File.Project"; const char G_FILE_SAVE[] = "QtCreator.Group.File.Save"; const char G_FILE_EXPORT[] = "QtCreator.Group.File.Export"; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 846b5d9dea2..ee5138f62e8 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -475,6 +475,7 @@ void MainWindow::registerDefaultContainers() filemenu->menu()->setTitle(Tr::tr("&File")); filemenu->appendGroup(Constants::G_FILE_NEW); filemenu->appendGroup(Constants::G_FILE_OPEN); + filemenu->appendGroup(Constants::G_FILE_SESSION); filemenu->appendGroup(Constants::G_FILE_PROJECT); filemenu->appendGroup(Constants::G_FILE_SAVE); filemenu->appendGroup(Constants::G_FILE_EXPORT); diff --git a/src/plugins/coreplugin/session.cpp b/src/plugins/coreplugin/session.cpp index 6b1723cf1e1..7954b50e341 100644 --- a/src/plugins/coreplugin/session.cpp +++ b/src/plugins/coreplugin/session.cpp @@ -100,7 +100,7 @@ SessionManager::SessionManager() ActionContainer *msession = ActionManager::createMenu(M_SESSION); msession->menu()->setTitle(PE::Tr::tr("S&essions")); msession->setOnAllDisabledBehavior(ActionContainer::Show); - mfile->addMenu(msession, Core::Constants::G_FILE_OPEN); + mfile->addMenu(msession, Core::Constants::G_FILE_SESSION); sb_d->m_sessionMenu = msession->menu(); connect(mfile->menu(), &QMenu::aboutToShow, this, [] { sb_d->updateSessionMenu(); }); From 6ef4bd0a65572715f79231c4e1fa0ad2b43fd437 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 11 Jul 2023 14:51:53 +0200 Subject: [PATCH 066/101] Revert "SquishTests: Adapt test for Qml debugging" This patch had been valid when there had been another different issue of using qmlpuppet instead of qmlviewer or qmlscene. The other issue is fixed, so this patch is obsolete and now wrong. Change-Id: I291651256db2da1763d918c34811f03950cdb322 Reviewed-by: Marcus Tillmanns --- .../suite_debugger/tst_qml_locals/test.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/system/suite_debugger/tst_qml_locals/test.py b/tests/system/suite_debugger/tst_qml_locals/test.py index 525f45f95fa..37ecb515cc6 100644 --- a/tests/system/suite_debugger/tst_qml_locals/test.py +++ b/tests/system/suite_debugger/tst_qml_locals/test.py @@ -48,9 +48,13 @@ def main(): earlyExit("Could not find expected Inspector tree inside Locals and Expressions.") return # reduce items to outer Rectangle object - items = items.getChild("QQmlApplicationEngine") + items = items.getChild("QQuickView") if items == None: - earlyExit("Could not find expected QQmlApplicationEngine tree inside Locals and Expressions.") + earlyExit("Could not find expected QQuickView tree inside Locals and Expressions.") + return + items = items.getChild("QQuickRootItem") + if items == None: + earlyExit("Could not find expected QQuickRootItem tree inside Locals and Expressions.") return items = items.getChild("Rectangle") if items == None: @@ -72,14 +76,13 @@ def main(): invokeMenuItem("File", "Exit") def __unfoldTree__(): - view = waitForObject(':Locals and Expressions_Debugger::Internal::WatchTreeView') # TODO inspect the qmlengine as well? - rootIndex = getQModelIndexStr("text='QQmlApplicationEngine'", + rootIndex = getQModelIndexStr("text='QQuickView'", ':Locals and Expressions_Debugger::Internal::WatchTreeView') - if not test.verify(view.isExpanded(waitForObject(rootIndex)), - "QQmlApplicationEngine should be expanded already."): - unfoldQModelIndex(rootIndex, False) - mainRect = getQModelIndexStr("text='Rectangle'", rootIndex) + unfoldQModelIndex(rootIndex, False) + quickRootItem = getQModelIndexStr("text='QQuickRootItem'", rootIndex) + unfoldQModelIndex(quickRootItem, False) + mainRect = getQModelIndexStr("text='Rectangle'", quickRootItem) unfoldQModelIndex(mainRect) subItems = ["text='Rectangle'", "text='Rectangle' occurrence='2'", "text='Text'"] for item in subItems: From ba755e50a364c350be8a5b9c1752b333d761da0b Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 11 Jul 2023 14:57:41 +0200 Subject: [PATCH 067/101] Utils: Fix inverted logic for checkableDecider (continued) Amends 6b6b1198dd5050a7a896ac9c7505ebcf2c9bce17 The commit above made sure that the display of the dialog was in sync with the checkbox in the settings dialog. Now also the "Do not show again" checkbox in the messagebox will be reflected in the settings dialog. Change-Id: Ieb186b134adac09c9846a64144056b3b89d297d8 Reviewed-by: hjk --- src/libs/utils/aspects.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 9bc51c7f530..b11e149c0d5 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -1611,7 +1611,7 @@ CheckableDecider BoolAspect::askAgainCheckableDecider() { return CheckableDecider( [this] { return value(); }, - [this] { setValue(true); } + [this] { setValue(false); } ); } From e11073aea6df6f925d76e496ca4186b979369212 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 12 Jul 2023 15:47:29 +0200 Subject: [PATCH 068/101] Change log: Exchange doc snapshot links with "real" links for the release. Also fix the link to terminal documentation, which changed in the meantime. Change-Id: Ieb1a14248d9569c7b46abf9d8554d41a604e0767 Reviewed-by: Reviewed-by: Leena Miettinen --- dist/changelog/changes-11.0.0.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/changelog/changes-11.0.0.md b/dist/changelog/changes-11.0.0.md index ebfc6584875..d26e8b2d60c 100644 --- a/dist/changelog/changes-11.0.0.md +++ b/dist/changelog/changes-11.0.0.md @@ -26,7 +26,7 @@ What's new? You can open markdown (.md) files for editing or select `File > New File > General > Markdown File` to create a new file. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-markdown-editor.html)) +([Documentation](https://docs.qt.io/qtcreator/creator-markdown-editor.html)) ### Terminal @@ -38,7 +38,7 @@ shells, colors, and fonts. To use an external terminal, deselect the `Use internal terminal` check box in `Preferences > Terminal`. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-output-panes.html#terminal)) +([Documentation](https://docs.qt.io/qtcreator/creator-reference-terminal-view.html)) ### Copilot @@ -48,7 +48,7 @@ suggest code in the `Edit` mode. To set Copilot preferences, select `Preferences > Copilot`. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-copilot.html)) +([Documentation](https://docs.qt.io/qtcreator/creator-copilot.html)) ### vcpkg @@ -64,7 +64,7 @@ project. Edit manifest files in the manifest editor. To search for packages to add to the file, select the `Search Package` button on the manifest editor toolbar. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-vcpkg.html)) +([Documentation](https://docs.qt.io/qtcreator/creator-vcpkg.html)) ### Axivion @@ -73,7 +73,7 @@ and link a project to an Axivion project in the project settings, Qt Creator shows annotations of the latest run in the editors and allows you to view some details on the issues. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-axivion.html)) +([Documentation](https://docs.qt.io/qtcreator/creator-axivion.html)) General ------- @@ -161,7 +161,7 @@ Editing * Fixed that too many progress indicators could be created ([QTCREATORBUG-29224](https://bugreports.qt.io/browse/QTCREATORBUG-29224)) - ([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-python-development.html)) + ([Documentation](https://docs.qt.io/qtcreator/creator-python-development.html)) Projects -------- @@ -189,7 +189,7 @@ Projects ([Documentation](https://doc.qt.io/qtcreator/creator-project-cmake.html)) * Added `Build > Reload CMake Presets` to reload CMake presets after making changes to them - ([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-build-settings-cmake-presets.html)) + ([Documentation](https://docs.qt.io/qtcreator/creator-build-settings-cmake-presets.html)) * Added support for the `block()` and `endblock()` CMake commands ([CMake documentation](https://cmake.org/cmake/help/latest/command/block.html#command:block)) * Fixed that CMake Presets were not visible in the `Projects` view From 4f83139dda3858698717c4323659ad1c261cfd8e Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 12 Jul 2023 17:09:32 +0200 Subject: [PATCH 069/101] Doc: Automatically list Reference topics in All Topics Task-number: QTCREATORBUG-29361 Change-Id: I688779bc74ea60d97b4f3aed050e2ca9cfbfca7e Reviewed-by: Eike Ziller --- doc/qtcreator/src/qtcreator-toc.qdoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 3874d687a91..0c0ca346603 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -240,6 +240,8 @@ \li \l{FAQ} \li \l{How-to} \li \l{Reference} + \generatelist creator-reference-sidebar-views + \generatelist creator-reference-output-views \li \l{Known Issues} \li \l{Glossary} \li \l{Technical Support} From 874969392ec48a6b8f09046ed9dce99c04ed3a1e Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 5 Jul 2023 11:32:07 +0200 Subject: [PATCH 070/101] German translation: Android Change-Id: I08401c6eb96968a1d0b584e89d703ff987537569 Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 386 ++++++++++--------- 1 file changed, 199 insertions(+), 187 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 333f027b46a..77e748af2e9 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -9307,7 +9307,7 @@ Locked components cannot be modified or selected. Force a specific NDK installation to be used by all Android kits.<br/>Note that the forced NDK might not be compatible with all registered Qt versions. - + Erzwingt die Nutzung einer bestimmten NDK-Installation für alle Android-Kits.<br/>Beachten Sie, dass die erzwungene NDK-Installation nicht unbedingt mit allen registrierten Qt-Versionen kompatibel ist. Open Android NDK download URL in the system's browser. @@ -9319,11 +9319,11 @@ Locked components cannot be modified or selected. Android SDK path exists and is writable. - + Pfad des Android-SDK existiert und ist schreibbar. JDK path exists and is writable. - + Pfad des JDK existiert und ist schreibbar. Android OpenSSL settings (Optional) @@ -9383,19 +9383,19 @@ Locked components cannot be modified or selected. OpenSSL prebuilt libraries cloning failed. - + Das Klonen der vorgefertigten OpenSSL-Bibliotheken ist fehlgeschlagen. The Git tool might not be installed properly on your system. - + Das Git-Werkzeug ist möglicherweise auf Ihrem System nicht richtig installiert. Unset Default - + Vorgabe aufheben Make Default - Als Vorgabe setzen + Als Vorgabe setzen The selected path already has a valid SDK Tools package. @@ -9407,23 +9407,23 @@ Locked components cannot be modified or selected. Android SDK Command-line Tools installed. - + Kommandozeilen-Werkzeug für Android-SDK ist installiert. Android SDK Command-line Tools run. - + Kommandozeilen-Werkzeug für Android-SDK startet erfolgreich. Android SDK Platform-Tools installed. - + Plattform-Werkzeuge für Android-SDK sind installiert. Android SDK Build-Tools installed. - + Erstellwerkzeuge für Android-SDK sind installiert. Android Platform SDK (version) installed. - + Plattform-SDK (Version) für Android ist installiert. Select an NDK @@ -9471,7 +9471,7 @@ Locked components cannot be modified or selected. Failed to create the SDK Tools path %1. - + Das Verzeichnis "%1" für die SDK-Werkzeuge konnte nicht erstellt werden. OpenSSL Cloning @@ -9503,11 +9503,11 @@ Locked components cannot be modified or selected. Encountered SSL errors, download is aborted. - + Es sind SSL-Fehler aufgetreten, das Herunterladen wurde abgebrochen. The SDK Tools download URL is empty. - + Die URL zum Herunterladen der SDK-Werkzeuge ist nicht gesetzt. Cancel @@ -9515,27 +9515,27 @@ Locked components cannot be modified or selected. Downloading SDK Tools package... - + Paket mit SDK-Werkzeugen wird heruntergeladen... Download SDK Tools - + SDK-Werkzeuge herunterladen Could not open %1 for writing: %2. - + Die Datei "%1" konnte nicht zum Schreiben geöffnet werden: %2. Downloading Android SDK Tools from URL %1 has failed: %2. - + Das Herunterladen der SDK-Werkzeuge für Android von der URL %1 ist fehlgeschlagen: %2. Download from %1 was redirected. - + Das Herunterladen von %1 wurde umgeleitet. Writing and verifying the integrity of the downloaded file has failed. - + Das Schreiben und Prüfen der Integrität der heruntergeladenen Datei sind fehlgeschlagen. Automatically download Android SDK Tools to selected location. @@ -9583,55 +9583,55 @@ manuellen Herunterladen im Browser des System zu öffnen. Device name: - Gerätename: + Gerätename: Device type: - Gerätetyp: + Gerätetyp: Unknown - Unbekannt + Unbekannt Serial number: - + Seriennummer: CPU architecture: - + CPU-Architektur: OS version: - Betriebssystemversion: + Betriebssystemversion: Yes - Ja + Ja No - Nein + Nein Authorized: - + Autorisiert: Android target flavor: - + Android Target-Flavor: Skin type: - + Skin-Typ: OpenGL status: - + OpenGL-Status: Android Device Manager - + Android Gerätemanager Run on Android @@ -9639,72 +9639,73 @@ manuellen Herunterladen im Browser des System zu öffnen. Refresh - Aktualisieren + Aktualisieren Start AVD - + AVD starten Erase AVD - + AVD löschen AVD Arguments - + AVD-Argumente Set up Wi-Fi - + Wi-Fi einrichten Emulator for "%1" - + Emulator für "%1" Physical device - + Physisches Gerät None - Keine + Kein Erase the Android AVD "%1"? This cannot be undone. - + Android-AVD "%1" löschen? +Dies kann nicht rückgängig gemacht werden. The device has to be connected with ADB debugging enabled to use this feature. - + Das Gerät muss mit aktiviertem ADB-Debuggen angeschlossen sein, um diese Funktionalität nutzen zu können. Opening connection port %1 failed. - + Das Öffnen des Ports %1 für die Verbindung ist fehlgeschlagen. Retrieving the device IP address failed. - + Das Abfragen der IP-Adresse des Geräts ist fehlgeschlagen. The retrieved IP address is invalid. - + Die erhaltene IP-Adresse ist ungültig. Connecting to the device IP "%1" failed. - + Die Verbindung zur Geräte-IP "%1" ist fehlgeschlagen. An error occurred while removing the Android AVD "%1" using avdmanager tool. - + Beim Entfernen des Android-AVD "%1" mit dem avdmanager-Werkzeug ist ein Fehler aufgetreten. Emulator Command-line Startup Options - + Kommandozeilenargumente für den Start des Emulators Emulator command-line startup options (<a href="%1">Help Web Page</a>): - + Kommandozeilenargumente für den Start des Emulators (<a href="%1">Hilfeseite</a>): Android Device @@ -9712,7 +9713,7 @@ This cannot be undone. The device info returned from AvdDialog is invalid. - + Die vom AvdDialog zurückgelieferte Geräteinformation ist ungültig. NDK is not configured in Devices > Android. @@ -9781,7 +9782,7 @@ This cannot be undone. Screen orientation: - + Bildschirmausrichtung: Advanced @@ -9914,11 +9915,11 @@ This cannot be undone. Cannot create a new AVD. No suitable Android system image is installed.<br/>Install a system image for the intended Android version from the SDK Manager. - + Erstellen von AVD nicht möglich. Es ist kein geeignetes System-Image installiert.<br/>Installieren Sie ein für die vorgesehene Android-Version passendes System-Image vom SDK-Manager. Cannot create an AVD for ABI %1.<br/>Install a system image for it from the SDK Manager tab first. - + Erstellen von AVD für ABI %1 nicht möglich.<br/>Installieren Sie zuerst ein passendes System-Image vom SDK-Manager. Name: @@ -9966,15 +9967,15 @@ This cannot be undone. Java Language Server - + Java Language Server Would you like to configure Android options? This will ensure Android kits can be usable and all essential packages are installed. To do it later, select Edit > Preferences > Devices > Android. - + Wollen Sie die Android-Einstellungen konfigurieren? Dies stellt sicher, dass Android-Kits nutzbar und alle notwendigen Pakete installiert sind. Wählen Sie Bearbeiten > Einstellungen > Geräte > Android, um dies später durchzuführen. Configure Android - + Android konfigurieren The process "%1" exited normally. @@ -10006,64 +10007,65 @@ This cannot be undone. Uninstall the existing app before deployment - + Existierende Anwendung vor dem Deployment deinstallieren No Android architecture (ABI) is set by the project. - + Vom Projekt ist keine Android-Architektur (ABI) gesetzt. The kit's run configuration is invalid. - + Die Ausführungskonfiguration des Kits ist ungültig. The kit's build configuration is invalid. - + Die Build-Konfiguration des Kits ist ungültig. The kit's build steps list is invalid. - + Die Liste der Build-Schritte des Kits sind ungültig. The kit's deploy configuration is invalid. - + Die Deployment-Konfiguration des Kits ist ungültig. No valid deployment device is set. - + Es ist kein gültiges Gerät für das Deployment gesetzt. The deployment device "%1" is invalid. - + Das Gerät "%1" für das Deployment ist ungültig. The deployment device "%1" does not support the architectures used by the kit. The kit supports "%2", but the device uses "%3". - + Das Gerät "%1" für das Deployment unterstützt nicht die Architektur, die vom Kit verwendet wird. +Das Kit unterstützt "%2", aber das Gerät verwendet "%3". The deployment device "%1" is disconnected. - + Das Gerät "%1" für das Deployment ist nicht verbunden. Android: The main ABI of the deployment device (%1) is not selected. The app execution or debugging might not work properly. Add it from Projects > Build > Build Steps > qmake > ABIs. - + Android: Die Haupt-ABI des Geräts für das Deployment (%1) ist nicht ausgewählt. Das Ausführen oder Debuggen der Anwendung funktioniert möglicherweise nicht korrekt. Fügen Sie sie in Projekte > Erstellen > Schritte zum Erstellen > qmake > ABIs hinzu. The deployment step's project node is invalid. - + Der Projektknoten des Deployment-Schritts ist nicht gültig. Cannot find the androiddeployqt input JSON file. - + Die JSON-Datei für androiddeployqt konnte nicht gefunden werden. Cannot find the package name from the Android Manifest file "%1". - + Der Paketname aus der Android-Manifest-Datei "%1" konnte nicht gefunden werden. Uninstalling the previous package "%1". - + Deinstalliere das vorherige Paket "%1". Starting: "%1" @@ -10071,11 +10073,11 @@ The kit supports "%2", but the device uses "%3". Installing the app failed even after uninstalling the previous one. - + Die Installation der Anwendung ist selbst nach der Deinstallation der vorherigen fehlgeschlagen. Installing the app failed with an unknown error. - + Die Installation der Anwendung ist mit einem unbekannten Fehler fehlgeschlagen. Deployment failed with the following errors: @@ -10095,7 +10097,7 @@ Möchten Sie das vorhandene Paket deinstallieren? The deployment AVD "%1" cannot be started. - + Das AVD für das Deployment "%1" konnte nicht gestartet werden. Pulling files necessary for debugging. @@ -10107,7 +10109,7 @@ Möchten Sie das vorhandene Paket deinstallieren? Deploy to Android device - + Deployment auf Android-Gerät %1 needs additional settings to enable Android support. You can configure those settings in the Options dialog. @@ -10135,11 +10137,11 @@ Möchten Sie das vorhandene Paket deinstallieren? "%1" step failed initialization. - + Die Initialisierung des Schritts "%1" ist fehlgeschlagen. Keystore/Certificate password verification failed. - + Die Überprüfung des Keystore/Zertifikat-Passworts ist fehlgeschlagen. Warning: Signing a debug or profile package. @@ -10147,7 +10149,7 @@ Möchten Sie das vorhandene Paket deinstallieren? The Qt version for kit %1 is invalid. - + Die Qt-Version für das Kit %1 ist ungültig. The minimum Qt version required for Gradle build to work is %1. It is recommended to install the latest Qt version. @@ -10173,7 +10175,7 @@ Der vom Kit mindestens benötigte API-Level ist %1. Product type is not an application, not building an APK. - + Der Produkttyp ist keine Anwendung, erstelle kein APK. Failed to run keytool. @@ -10215,7 +10217,7 @@ Der vom Kit mindestens benötigte API-Level ist %1. Could not start process "%1". - + Der Prozess "%1" konnte nicht gestartet werden. Cannot create AVD. Command timed out. @@ -10227,35 +10229,35 @@ Der vom Kit mindestens benötigte API-Level ist %1. This is useful for apps that use SSL operations. The path can be defined in Edit > Preferences > Devices > Android. - + Dies ist hilfreich für Anwendungen, die SSL-Operationen durchführen. Der Pfad kann in Bearbeiten > Einstellungen > Geräte > Android angepasst werden. No valid input file for "%1". - + Keine gültige Eingabedatei für "%1". Android build SDK version is not defined. Check Android settings. - + Die Version des Android Build-SDK ist nicht definiert. Überprüfen Sie die Android-Einstellungen. The Android build folder %1 was not found and could not be created. - + Das Build-Verzeichnis "%1" für Android wurde nicht gefunden und konnte nicht erstellt werden. Cannot copy the target's lib file %1 to the Android build folder %2. - + Die lib-Datei "%1" des Targets konnte nicht in das Build-Verzeichnis "%2" für Android kopiert werden. Cannot copy file "%1" to Android build libs folder "%2". - + Die Datei "%1" konnte nicht in das libs-Verzeichnis des Build-Verzeichnisses für Android "%2" kopiert werden. Cannot open androiddeployqt input file "%1" for writing. - + Die Eingabedatei "%1" für androiddeployqt konnte nicht zum Schreiben geöffnet werden. Cannot set up "%1", not building an APK. - + "%1" konnte nicht eingerichtet werden, erstelle kein APK. Enter keystore password @@ -10275,11 +10277,11 @@ Der vom Kit mindestens benötigte API-Level ist %1. Cannot find C++ debug server in NDK installation. - + In der NDK-Installation wurde kein C++-Debug-Server gefunden. The lldb-server binary has not been found. - + Die ausführbare Datei für lldb-server wurde nicht gefunden. Failed to forward QML debugging ports. @@ -10291,7 +10293,7 @@ Der vom Kit mindestens benötigte API-Level ist %1. Activity Manager threw the error: %1 - + Der Activity Manager hat den folgenden Fehler ausgelöst: %1 Failed to forward JDB debugging ports. @@ -10343,27 +10345,27 @@ Der vom Kit mindestens benötigte API-Level ist %1. Default - Vorgabe + Vorgabe Stable - + Stabil Beta - + Beta Dev - + Dev Canary - + Canary Include obsolete - + Veraltete einschließen Installed @@ -10383,13 +10385,15 @@ Der vom Kit mindestens benötigte API-Level ist %1. Channel: - + Kanal: %1 cannot find the following essential packages: "%2". Install them manually after the current operation is done. - + %1 kann folgende notwendige Pakete nicht finden: "%2". +Installieren Sie diese manuell, nachdem der aktuelle Vorgang abgeschlossen ist. + Checking pending licenses... @@ -10400,7 +10404,8 @@ Install them manually after the current operation is done. The installation of Android SDK packages may fail if the respective licenses are not accepted. - + Die Installation von Android-SDK-Paketen kann fehlschlagen, wenn die entsprechenden Lizenzen nicht akzeptiert werden. + @@ -10563,15 +10568,15 @@ Breche ausstehende Operationen ab... <b>Make install:</b> Copy App Files to %1 - + <b>Installieren:</b> Anwendungsdateien nach "%1" kopieren "%1" step has an invalid C++ toolchain. - + Schritt "%1" hat eine ungültige C++-Toolchain. Product type is not an application, not running the Make install step. - + Der Produkttyp ist keine Anwendung, führe den Installationsschritt nicht aus. Removing directory %1 @@ -10580,7 +10585,8 @@ Breche ausstehende Operationen ab... Failed to clean "%1" from the previous build, with error: %2 - + Das Bereinigen von "%1" vom vorherigen Build ist fehlgeschlagen: +%2 Deploy to device @@ -10604,15 +10610,15 @@ Breche ausstehende Operationen ab... Activity manager start arguments: - + Activity Manager Startargumente: Pre-launch on-device shell commands: - + Shell-Kommandos auf dem Gerät vor dem Start: Post-quit on-device shell commands: - + Shell-Kommandos auf dem Gerät nach dem Beenden: Create Templates @@ -10620,7 +10626,7 @@ Breche ausstehende Operationen ab... Build Android App Bundle (*.aab) - + Android App Bundle (*.aab) erstellen Additional Libraries @@ -10652,23 +10658,23 @@ Breche ausstehende Operationen ab... Android build-tools version: - + Android build-tools-Version: Android build platform SDK: - + Android Build-Plattform-SDK: Create an Android package for Custom Java code, assets, and Gradle configurations. - + Erstellt ein Android-Paket für benutzerdefinierten Java-Code, Assets und Gradle-Konfigurationen. Android customization: - + Android-Anpassungen: Application Signature - + Anwendungssignatur Select Keystore File @@ -10748,7 +10754,8 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni The Android template files will be created in the %1 set in the .pro file. - + %1 is the qmake variable ANDROID_PACKAGE_SOURCE_DIR + Die Template-Dateien für Android werden in dem Verzeichnis erstellt, dass als %1 in der .pro-Datei angegeben ist. Create Android Template Files Wizard @@ -10780,290 +10787,295 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni Master icon - + Hauptsymbol Select master icon. - + Hauptsymbol auswählen. LDPI icon - + LDPI-Symbol Select an icon suitable for low-density (ldpi) screens (~120dpi). - + Wählen Sie ein Symbol, das für Bildschirme mit niedrigem DPI-Wert (ldpi, ~120dpi) geeignet ist. MDPI icon - + MDPI-Symbol Select an icon for medium-density (mdpi) screens (~160dpi). - + Wählen Sie ein Symbol, das für Bildschirme mit mittlerem DPI-Wert (mdpi, ~160dpi) geeignet ist. HDPI icon - + HDPI-Symbol Select an icon for high-density (hdpi) screens (~240dpi). - + Wählen Sie ein Symbol, das für Bildschirme mit hohem DPI-Wert (hdpi, ~240dpi) geeignet ist. XHDPI icon - + XHDPI-Symbol Select an icon for extra-high-density (xhdpi) screens (~320dpi). - + Wählen Sie ein Symbol, das für Bildschirme mit besonders hohem DPI-Wert (xdpi, ~320dpi) geeignet ist. XXHDPI icon - + XXHDPI-Symbol Select an icon for extra-extra-high-density (xxhdpi) screens (~480dpi). - + Wählen Sie ein Symbol, das für Bildschirme mit ganz besonders hohem DPI-Wert (xxhdpi, ~480dpi) geeignet ist. XXXHDPI icon - + XXXHDPI-Symbol Select an icon for extra-extra-extra-high-density (xxxhdpi) screens (~640dpi). - + Wählen Sie ein Symbol, das für Bildschirme mit extrem hohem DPI-Wert (xxxdpi, ~640dpi) geeignet ist. Icon scaled up. - + Vergößertes Symbol. Click to select... - + Klicken zum Auswählen... Images (*.png *.jpg *.jpeg *.webp *.svg) - + Bilder (*.png *.jpg *.jpeg *.webp *.svg) %1 has been stopped. - + %1 wurde angehalten. Selected device is invalid. - + Das ausgewählte Gerät ist ungültig. Selected device is disconnected. - + Das ausgewählte Gerät ist nicht verbunden. Launching AVD. - + Starte AVD. Could not start AVD. - + Das Starten des AVD ist fehlgeschlagen. No valid AVD has been selected. - + Es wurde kein gültiges AVD ausgewählt. Checking if %1 app is installed. - + Überprüfe, ob die Anwendung %1 installiert ist. ABI of the selected device is unknown. Cannot install APK. - + Die ABI des ausgewählten Geräts ist unbekannt. Kann das APK nicht installieren. Cannot install %1 app for %2 architecture. The appropriate APK was not found in resources folders. - + Kann die Anwendung %1 nicht für die Architektur %2 installieren. Es wurde kein passendes APK in den Ressourcenverzeichnissen gefunden. Installing %1 APK. - + Installiere APK für %1. Too many .qmlproject files in your project. Open directly the .qmlproject file you want to work with and then run the preview. - + Es existieren zu viele .qmlproject-Dateien in Ihrem Projekt. Öffnen Sie die gewünschte .qmlproject-Datei direkt und starten Sie dann die Vorschau. No .qmlproject file found among project files. - + Es wurde keine .qmlproject-Datei in den Projektdateien gefunden. Could not gather information on project files. - + Das Einholen von Informationen über Projektdateien ist fehlgeschlagen. Could not create file for %1 "%2". - + %2 is a command line for a rcc call + Das Erstellen einer Datei für %1 ist fehlgeschlagen ("%2"). A timeout occurred running "%1". - + Zeitüberschreitung bei Ausführung von "%1". Crash while creating file for %1 "%2". - + %2 is a command line for a rcc call + Der Prozess zum Erstellen einer Datei für %1 ist abgestürzt ("%2"). Creating file for %1 failed. "%2" (exit code %3). - + Das Erstellen einer Datei für %1 ist fehlgeschlagen. "%2" (Rückgabewert %3). Uploading files. - + Lade Dateien hoch. Starting %1. - Starte %1. + Starte %1. %1 is running. - + %1 wird ausgeführt. Java: - + Java: Java Language Server: - + Java Language Server: Path to equinox launcher jar - + Pfad zur jar-Datei für den Equinox Launcher Select splash screen image - + Wählen Sie ein Bild für den Startbildschirm Portrait splash screen - + Startbildschirm (Hochformat) Select portrait splash screen image - + Wählen Sie ein Bild für den Startbildschirm im Hochformat Landscape splash screen - + Startbildschirm (Querformat) Select landscape splash screen image - + Wählen Sie ein Bild für den Startbildschirm im Querformat Clear All - + Alle löschen A non-sticky splash screen is hidden automatically when an activity is drawn. To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen(). - + Ein Startbildschirm, der nicht angeheftet (sticky) ist, wird automatisch versteckt, wenn eine Aktivität dargestellt wird. +Rufen Sie QtAndroid::hideSplashScreen() auf, um einen Startbildschirm zu verstecken, der angeheftet (sticky) ist. Sticky splash screen: - + Angehefteter Startbildschirm (sticky): Image show mode: - + Bildanzeigemodus: Background color of the splash screen. - + Hintergrundfarbe des Startbildschirms. Background color: - + Hintergrundfarbe: Select master image to use. - + Wählen Sie das zu benutzende Hauptbild aus. Master image: - + Hauptbild: Select portrait master image to use. - + Wählen Sie das Hauptbild im Hochformat aus. Portrait master image: - + Hauptbild (Hochformat): Select landscape master image to use. - + Wählen Sie das Hauptbild im Querformat aus. Landscape master image: - + Hauptbild (Querformat): LDPI - + LDPI MDPI - + MDPI HDPI - + HDPI XHDPI - + XHDPI XXHDPI - + XXHDPI XXXHDPI - + XXXHDPI An image is used for the splashscreen. Qt Creator manages splashscreen by using a different method which requires changing the manifest file by overriding your settings. Allow override? - + Für den Startbildschirm wird ein Bild benutzt. Qt Creator verwaltet +Startbildschirme auf andere Weise, was eine Änderung der Manifest-Datei +und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlauben? Convert - + Umwandeln Select background color - + Hintergrundfarbe auswählen Select master image - + Hauptbild auswählen Select portrait master image - + Hauptbild im Hochformat auswählen Select landscape master image - + Hauptbild im Querformat auswählen Images - + Bilder Images (*.png *.jpg *.jpeg) - + Bilder (*.png *.jpg *.jpeg) From 6cdb27d01b4a43fbf80a41696e78a3ae15e1b4f1 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 13 Jul 2023 11:12:18 +0200 Subject: [PATCH 071/101] Doc: Add how-to and reference topics to All Topics This also improves the breadcrumbs. Task-number: QTCREATORBUG-29361 Change-Id: I0a70f80a68929ab37f9ad7e54c5c67ce1a18c4de Reviewed-by: Eike Ziller --- .../creator-only/creator-help-overview.qdoc | 4 ++ doc/qtcreator/src/qtcreator-toc.qdoc | 71 ++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc index 4b7db858d43..bf792f5564d 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc @@ -34,6 +34,10 @@ Lists useful \QC features. + \li \l{Reference} + + Lists the sidebar views and the output views. + \li \l{Known Issues} Lists known issues in \QC version \qtcversion. The development team diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 0c0ca346603..f39905835fc 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -239,9 +239,76 @@ \li \l{Using the Help Mode} \li \l{FAQ} \li \l{How-to} + \list + \li Use the UI + \list + \li \l {Assign keyboard shortcuts} + \li \l {Find a particular preference} + \li \l {Find keyboard shortcuts} + \li \l {Find menu items on \macos} + \li \l {Import and export keyboard shortcuts} + \li \l {Set high DPI scaling} + \li \l {Set the number of recent files shown} + \li \l {Show and hide sidebars} + \li \l {Switch between modes} + \li \l {Switch UI themes} + \li \l {View output} + \endlist + \li Edit Code + \list + \li \l {Add code snippets to the auto-complete menu} + \li \l {Enclose selected code in curly braces, parentheses, or double quotes} + \li \l {Jump to a function in QML code} + \li \l {Locate files using the keyboard} + \li \l {Move between open files} + \li \l {Move to symbols} + \li \l {Paste text from clipboard history} + \li \l {Perform calculations} + \li \l {Search and replace across files using a regular expression} + \li \l {Select the enclosing block in C++} + \li \l {Sort lines alphabetically} + \li \l {Switch to Edit mode} + \li \l {Write down notes} + \endlist + \li Design UIs + \list + \li \l {Export SVG images} + \li \l {View images} + \endlist + \li Manage Projects + \list + \li \l {Add a license header template for C++ code} + \endlist + \li Use \QC + \list + \li \l {Enable and disable plugins} + \li \l {Find settings files} + \li \l {Install plugins} + \li \l {Run \QC from the command line} + \endlist + \endlist \li \l{Reference} - \generatelist creator-reference-sidebar-views - \generatelist creator-reference-output-views + \list + \li Sidebar Views + \list + \li \l {Call Hierarchy} + \li \l {Class View} + \li \l {File System} + \li \l {Include Hierarchy} + \li \l {Open Documents} + \li \l {Outline} + \li \l {Projects} + \li \l {Type Hierarchy} + \endlist + \li Output Views + \list + \li \l {Application Output} + \li \l {Compile Output} + \li \l {Issues} + \li \l {Search Results} + \li \l {To-Do Entries} + \endlist + \endlist \li \l{Known Issues} \li \l{Glossary} \li \l{Technical Support} From 326c8aa7d50bd54e53759a706d56c311799bc033 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 13 Jul 2023 11:32:40 +0200 Subject: [PATCH 072/101] Update change log for 11.0.0 Change-Id: Iaecfc0a18bb9b12f865b78992969106efde7af1b Reviewed-by: Leena Miettinen --- dist/changelog/changes-11.0.0.md | 64 ++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/dist/changelog/changes-11.0.0.md b/dist/changelog/changes-11.0.0.md index d26e8b2d60c..916c92954e4 100644 --- a/dist/changelog/changes-11.0.0.md +++ b/dist/changelog/changes-11.0.0.md @@ -121,10 +121,17 @@ Editing * Fixed that the locator showed both the declaration and the definition of symbols ([QTCREATORBUG-13894](https://bugreports.qt.io/browse/QTCREATORBUG-13894)) * Fixed the handling of C++20 keywords and concepts +* Fixed that the automatic Doxygen comment generation did not work when + initializer lists `{}` were present + ([QTCREATORBUG-29198](https://bugreports.qt.io/browse/QTCREATORBUG-29198)) +* Fixed an issue when matching braces + ([QTCREATORBUG-29339](https://bugreports.qt.io/browse/QTCREATORBUG-29339)) * Clangd * Fixed that the index could be outdated after VCS operations * Fixed the highlighting of labels ([QTCREATORBUG-27338](https://bugreports.qt.io/browse/QTCREATORBUG-27338)) + * Fixed freezes when showing tool tips + ([QTCREATORBUG-29356](https://bugreports.qt.io/browse/QTCREATORBUG-29356)) * Built-in * Fixed support for `if`-statements with initializer ([QTCREATORBUG-29182](https://bugreports.qt.io/browse/QTCREATORBUG-29182)) @@ -150,7 +157,10 @@ Editing * Fixed the completion for Qt Quick Controls ([QTCREATORBUG-28648](https://bugreports.qt.io/browse/QTCREATORBUG-28648)) * Fixed that `qmllint` issues were not shown in the `Issues` view - ([QTCREATORBUG-28720](https://bugreports.qt.io/browse/QTCREATORBUG-28720)) + ([QTCREATORBUG-28720](https://bugreports.qt.io/browse/QTCREATORBUG-28720), + [QTCREATORBUG-27762](https://bugreports.qt.io/browse/QTCREATORBUG-27762)) +* Fixed a wrong `M16` warning + ([QTCREATORBUG-28468](https://bugreports.qt.io/browse/QTCREATORBUG-28468)) ### Python @@ -163,6 +173,11 @@ Editing ([Documentation](https://docs.qt.io/qtcreator/creator-python-development.html)) +### Meson + +* Fixed the file targets + ([QTCREATORBUG-29349](https://bugreports.qt.io/browse/QTCREATORBUG-29349)) + Projects -------- @@ -187,15 +202,28 @@ Projects [QTCREATORBUG-28985](https://bugreports.qt.io/browse/QTCREATORBUG-28985), [QTCREATORBUG-29006](https://bugreports.qt.io/browse/QTCREATORBUG-29006)) ([Documentation](https://doc.qt.io/qtcreator/creator-project-cmake.html)) -* Added `Build > Reload CMake Presets` to reload CMake presets after making - changes to them - ([Documentation](https://docs.qt.io/qtcreator/creator-build-settings-cmake-presets.html)) * Added support for the `block()` and `endblock()` CMake commands ([CMake documentation](https://cmake.org/cmake/help/latest/command/block.html#command:block)) -* Fixed that CMake Presets were not visible in the `Projects` view - ([QTCREATORBUG-28966](https://bugreports.qt.io/browse/QTCREATORBUG-28966)) * Fixed issues with detecting a configured Qt version when importing a build ([QTCREATORBUG-29075](https://bugreports.qt.io/browse/QTCREATORBUG-29075)) +* Fixed the project wizards for Qt 6.3 and earlier + ([QTCREATORBUG-29067](https://bugreports.qt.io/browse/QTCREATORBUG-29067)) +* Presets + * Added `Build > Reload CMake Presets` to reload CMake presets after making + changes to them + ([Documentation](https://docs.qt.io/qtcreator/creator-build-settings-cmake-presets.html)) + * Fixed that presets were not visible in the `Projects` view + ([QTCREATORBUG-28966](https://bugreports.qt.io/browse/QTCREATORBUG-28966)) + * Fixed the type handling of the `architecture` and `toolset` fields + ([QTCREATORBUG-28693](https://bugreports.qt.io/browse/QTCREATORBUG-28693)) + * Fixed the setting for QML debugging when creating build configurations + ([QTCREATORBUG-29311](https://bugreports.qt.io/browse/QTCREATORBUG-29311)) + + +### Qmake + +* Fixed an infinite loop when the Qt ABI changed + ([QTCREATORBUG-29204](https://bugreports.qt.io/browse/QTCREATORBUG-29204)) ### Python @@ -214,6 +242,10 @@ Debugging ([QTCREATORBUG-28950](https://bugreports.qt.io/browse/QTCREATORBUG-28950)) * Fixed pretty printer for `std::string` for recent `libc++` ([QTCREATORBUG-29230](https://bugreports.qt.io/browse/QTCREATORBUG-29230)) +* Fixed the pretty printers on Fedora 37 + ([QTCREATORBUG-28659](https://bugreports.qt.io/browse/QTCREATORBUG-28659)) +* Fixed the display of arrays with `Array of 10,000 items` + ([QTCREATORBUG-29196](https://bugreports.qt.io/browse/QTCREATORBUG-29196)) ### C++ @@ -266,6 +298,11 @@ Platforms * Fixed an issue with building library targets ([QTCREATORBUG-26980](https://bugreports.qt.io/browse/QTCREATORBUG-26980)) +### iOS + +* Improved the bundle ID that the project wizards create + ([QTCREATORBUG-29340](https://bugreports.qt.io/browse/QTCREATORBUG-29340)) + ### Remote Linux * Removed the automatic sourcing of target-side shell profiles @@ -277,6 +314,14 @@ Platforms * Fixed issues after deleting the Docker image for a registered Docker device ([QTCREATORBUG-28880](https://bugreports.qt.io/browse/QTCREATORBUG-28880)) +### MCU + +* Fixed that errors were shown for valid QML code + ([QTCREATORBUG-26655](https://bugreports.qt.io/browse/QTCREATORBUG-26655), + [QTCREATORBUG-29155](https://bugreports.qt.io/browse/QTCREATORBUG-29155)) +* Fixed that files were missing from locator and project search + ([QTCREATORBUG-29297](https://bugreports.qt.io/browse/QTCREATORBUG-29297)) + ### QNX * Added `slog2info` as a requirement for devices @@ -289,6 +334,8 @@ Aleksei German Alessandro Portale Alexander Drozdov Alexander Pershin +Alexey Edelev +Alexis Jeandet Ali Kianian Alibek Omarov Amr Essam @@ -309,8 +356,10 @@ Esa Törmänen Fabian Kosmale Filippo Gentile Friedemann Kleint +Haowei Hsu Henning Gruendl Jaroslaw Kobus +Joni Poikelin Jussi Witick Kai Köhne Knud Dollereder @@ -324,6 +373,7 @@ Mats Honkamaa Miikka Heikkinen Mitch Curtis Niels Weber +Olivier Delaune Orgad Shaneh Pranta Dastider Robert Löhning @@ -333,8 +383,8 @@ Tasuku Suzuki Thiago Macieira Thomas Hartmann Tim Jenssen -Tim Jenßen Ulf Hermann Vikas Pachdha +Wladimir Leuschner Yasser Grimes Yixue Wang From 80c3b30366bab80bc7dc9dc44e62d59345bd7da5 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 11 Jul 2023 14:08:31 +0200 Subject: [PATCH 073/101] SquishTests: Attempt to stabilize tests on macOS Change-Id: Ifd7137f88e9d8736cbc7d1a4374f8ce640c1082b Reviewed-by: Marcus Tillmanns Reviewed-by: Christian Stenger Reviewed-by: --- tests/system/shared/qtcreator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 8ad3a7eccf9..0b86001529f 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -45,8 +45,9 @@ def __closeInfoBarEntry__(leftButtonText): leftWidget = "leftWidget={%s}" % (toolButton % leftButtonText) test.log("closing %s" % leftButtonText) buttonObjStr = "{%s %s}" % (doNotShowAgain, leftWidget) + checkIfObjectExists(buttonObjStr, verboseOnFail=True) clickButton(waitForObject(buttonObjStr)) - waitFor('object.exists(buttonObjStr) == False', 2000) + checkIfObjectExists(buttonObjStr, False, 2000, True) # additionalParameters must be a list or tuple of strings or None def startQC(additionalParameters=None, withPreparedSettingsPath=True, closeLinkToQt=True, cancelTour=True): From 81cf54f7cd34d26cd5e28176228dcd0a57cf53af Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 11 Jul 2023 15:13:34 +0200 Subject: [PATCH 074/101] CMakePM: Persist "Do not show again" for preset reload dialog Was not persisted and would pop up every time. Change-Id: I6fa6d7d57948a917f08ebc91382774355734f7a6 Reviewed-by: Reviewed-by: Alessandro Portale --- src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 88cb4e168a7..7e2e854ab4b 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -246,6 +246,8 @@ void CMakeManager::reloadCMakePresets() {QMessageBox::Yes, Tr::tr("Reload")}, }); + settings->writeSettings(Core::ICore::settings()); + if (clickedButton == QMessageBox::Cancel) return; From 733279e01769857e684a4f4cc562ae68a79015f5 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 13 Jul 2023 19:36:33 +0200 Subject: [PATCH 075/101] CMakeProjectManager: Deselect "Stage for installation" for WebAssembly There is no CMake install target for WebAssembly. Therefore, the "Stage for installation" option needs to be deseleceted, like it is being done for Android and iOS. Amends: 2387e9e37aeb5b4acf6b2b1bdb1f8f047e23c1d4 Fixes: QTCREATORBUG-29293 Change-Id: I954dc492259b7211d3dc68047dbb6d7a8e6579b9 Reviewed-by: hjk --- src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 9e4a705fb54..c5b130dbecd 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -16,6 +16,8 @@ #include +#include + #include #include #include @@ -185,7 +187,8 @@ static bool supportsStageForInstallation(const Kit *kit) QTC_ASSERT(buildDevice, return false); return runDevice->id() != buildDevice->id() && runDevice->type() != Android::Constants::ANDROID_DEVICE_TYPE - && runDevice->type() != Ios::Constants::IOS_DEVICE_TYPE; + && runDevice->type() != Ios::Constants::IOS_DEVICE_TYPE + && runDevice->type() != WebAssembly::Constants::WEBASSEMBLY_DEVICE_TYPE; } CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) : From a3cf817c09ea33a927c13bd3960bab7fba7482d0 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 13 Jul 2023 19:21:01 +0200 Subject: [PATCH 076/101] TaskTree: Small doc correction The setup handler isn't mandatory anymore. Make it consistent with the rest of the docs. Change-Id: I9099d26e6731f12be4bd66c52c7757735aafde61 Reviewed-by: Leena Miettinen --- src/libs/solutions/tasking/tasktree.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libs/solutions/tasking/tasktree.cpp b/src/libs/solutions/tasking/tasktree.cpp index ff43b3a6129..4e6b40ccc1e 100644 --- a/src/libs/solutions/tasking/tasktree.cpp +++ b/src/libs/solutions/tasking/tasktree.cpp @@ -1614,7 +1614,7 @@ void TaskNode::invokeEndHandler(bool success) \endcode The task tree above has a top level element of the Group type that contains - tasks of the type ProcessTask, FileTransferTask, and ConcurrentCallTask. + tasks of the ProcessTask, FileTransferTask, and ConcurrentCallTask type. After taskTree->start() is called, the tasks are run in a chain, starting with ProcessTask. When the ProcessTask finishes successfully, the ConcurrentCallTask task is started. Finally, when the asynchronous task finishes successfully, the @@ -1765,7 +1765,7 @@ void TaskNode::invokeEndHandler(bool success) \section2 Task's Start Handler When a corresponding task class object is created and before it's started, - the task tree invokes a mandatory user-provided setup handler. The setup + the task tree invokes an optionally user-provided setup handler. The setup handler should always take a \e reference to the associated task class object: \code @@ -2150,7 +2150,7 @@ void TaskNode::invokeEndHandler(bool success) \section1 Task Adapters - To extend a TaskTree with new a task type, implement a simple adapter class + To extend a TaskTree with a new task type, implement a simple adapter class derived from the TaskAdapter class template. The following class is an adapter for a single shot timer, which may be considered as a new asynchronous task: @@ -2164,10 +2164,11 @@ void TaskNode::invokeEndHandler(bool success) task()->setInterval(1000); connect(task(), &QTimer::timeout, this, [this] { emit done(true); }); } + private: void start() final { task()->start(); } }; - QTC_DECLARE_CUSTOM_TASK(TimeoutTask, TimeoutTaskAdapter); + TASKING_DECLARE_TASK(TimeoutTask, TimeoutTaskAdapter); \endcode You must derive the custom adapter from the TaskAdapter class template @@ -2178,12 +2179,12 @@ void TaskNode::invokeEndHandler(bool success) accessible through the TaskAdapter::task() method. The constructor of TimeoutTaskAdapter initially configures the QTimer object and connects to the QTimer::timeout signal. When the signal is triggered, TimeoutTaskAdapter - emits the done(true) signal to inform the task tree that the task finished - successfully. If it emits done(false), the task finished with an error. + emits the \c done(true) signal to inform the task tree that the task finished + successfully. If it emits \c done(false), the task finished with an error. The TaskAdapter::start() method starts the timer. To make QTimer accessible inside TaskTree under the \e TimeoutTask name, - register it with QTC_DECLARE_CUSTOM_TASK(TimeoutTask, TimeoutTaskAdapter). + register it with TASKING_DECLARE_TASK(TimeoutTask, TimeoutTaskAdapter). TimeoutTask becomes a new task type inside Tasking namespace, using TimeoutTaskAdapter. The new task type is now registered, and you can use it in TaskTree: From cfc39037dbf12ac8ec9caea2e3fdb086d28e95a3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 13 Jul 2023 13:41:23 +0200 Subject: [PATCH 077/101] German translation: Meson Change-Id: Idfeb30c506fe827736734e42a73c646f2292652f Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 66 ++++++++++---------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 77e748af2e9..c57fe968271 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -34570,16 +34570,17 @@ Beispiel: *.cpp%1*.h Wipe Project - + Projekt bereinigen Wipes build directory and reconfigures using previous command line options. Useful if build directory is corrupted or when rebuilding with a newer version of Meson. - + Löscht das Build-Verzeichnis und konfiguriert das Projekt erneut mit den vorherigen Kommandozeilenargumenten. +Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt mit einer neuen Version von Meson neu erstellt werden soll. Parameters: - + Parameter: Tool arguments: @@ -34591,7 +34592,8 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Meson Build - + name of the build step + Erstellen mit Meson Configure @@ -34624,7 +34626,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Configuring "%1". - Konfiguriere "%1" + Konfiguriere "%1". Running %1 in %2. @@ -34636,15 +34638,15 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Command is not executable: %1 - + Kommando ist nicht ausführbar: %1 No Meson tool set. - + Kein Meson-Werkzeug konfiguriert. No Ninja tool set. - + Kein Ninja-Werkzeug konfiguriert. No compilers set in kit. @@ -34652,19 +34654,19 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Autorun Meson - + Meson automatisch ausführen Automatically run Meson when needed. - + Führt Meson bei Bedarf automatisch aus. Ninja verbose mode - + Ausführlicher Ninja-Modus Enables verbose mode by default when invoking Ninja. - + Aktiviert standardmäßig den ausführlichen Modus beim Ausführen von Ninja. General @@ -34672,15 +34674,15 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Meson Tool - + Meson-Werkzeug The Meson tool to use when building a project with Meson.<br>This setting is ignored when using other build systems. - + Das zum Erstellen eines Projektes mit Meson zu verwendende Meson-Werkzeug.<br>Diese Einstellung wird bei der Verwendung anderer Build-Systeme ignoriert. Cannot validate this meson executable. - + Die Überprüfung der ausführbaren Meson-Datei ist fehlgeschlagen. Unconfigured @@ -34696,7 +34698,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o New Meson or Ninja tool - + Neues Meson- oder Ninja-Werkzeug Tools @@ -34712,67 +34714,67 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Meson executable path does not exist. - + Pfad für das Meson-Werkzeug existiert nicht. Meson executable path is not a file. - + Pfad für das Meson-Werkzeug ist keine Datei. Meson executable path is not executable. - + Pfad für das Meson-Werkzeug ist nicht ausführbar. Cannot get tool version. - + Das Ermitteln der Werkzeug-Version ist fehlgeschlagen. Meson build: Parsing failed - + Erstellen mit Meson: Fehler beim Auswerten Ninja Tool - + Ninja-Werkzeug The Ninja tool to use when building a project with Meson.<br>This setting is ignored when using other build systems. - + Das zum Erstellen eines Projektes mit Meson zu verwendende Ninja-Werkzeug.<br>Diese Einstellung wird bei der Verwendung anderer Build-Systeme ignoriert. Cannot validate this Ninja executable. - + Die Überprüfung der ausführbaren Ninja-Datei ist fehlgeschlagen. Ninja - + Ninja Name: - Name: + Name: Path: - Pfad: + Pfad: Add - Hinzufügen + Hinzufügen Clone - Klonen + Klonen Remove - + Entfernen Make Default - Als Vorgabe setzen + Als Vorgabe setzen Set as the default Meson executable to use when creating a new kit or when no value is set. - + Als vorgegebenes Meson-Werkzeug einstellen, das verwendet wird, wenn eine neues Kit erstellt wird oder kein Wert eingestellt ist. From 9e3b938d36b8891afa4789faf1d14635f201d1fa Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 13 Jul 2023 13:57:08 +0200 Subject: [PATCH 078/101] German translation: Nim, QbsProjectManager Change-Id: I7439d9f027d84e930bbb3d61131588614cb8439e Reviewed-by: Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 54 ++++++++++---------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index c57fe968271..aa352935df3 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -35069,7 +35069,7 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt Path: - Pfad: + Pfad: Global @@ -35111,27 +35111,27 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt Nimble Build - + Erstellen mit Nimble Nimble Test - + Nimble-Test Nimble Task - + Nimble-Aufgabe Task arguments: - + Aufgabenargumente: Tasks: - + Aufgaben: Nimble task %1 not found. - + Nimble-Aufgabe %1 wurde nicht gefunden. @@ -42234,7 +42234,7 @@ fails because Clang does not understand the target architecture. ABIs: - ABIs: + ABIs: Parallel jobs: @@ -42296,7 +42296,7 @@ fails because Clang does not understand the target architecture. Profile Shadow build directory suffix Non-ASCII characters in directory suffix may cause build issues. - Profile + Profile Qbs Build @@ -42480,20 +42480,20 @@ fails because Clang does not understand the target architecture. Reset - Zurücksetzen + Zurücksetzen Use %1 settings directory for Qbs %1 == "Qt Creator" or "Qt Design Studio" - + Das Verzeichnis für Einstellungen von %1 auch für Qbs benutzen Path to qbs executable: - + Pfad zur ausführbaren qbs-Datei: Default installation directory: - + Vorgabe-Installationsverzeichnis: Qbs version: @@ -42501,7 +42501,7 @@ fails because Clang does not understand the target architecture. Failed to retrieve version. - + Die Version konnte nicht ermittelt werden. General @@ -42509,54 +42509,56 @@ fails because Clang does not understand the target architecture. Failed to run qbs config: %1 - + Das Ausführen von qbs config ist fehlgeschlagen: %1 Received invalid input. - + Ungültige Eingabe erhalten. No qbs executable was found, please set the path in the settings. - + Es wurde keine ausführbare qbs-Datei gefunden, bitte setzen Sie den Pfad in den Einstellungen. The qbs executable was not found at the specified path, or it is not executable ("%1"). - + Die ausführbare qbs-Datei wurde am angegebenen Pfad nicht gefunden oder ist nicht ausführbar ("%1"). The qbs process quit unexpectedly. - + Der qbs-Prozess wurde unerwartet beendet. The qbs process failed to start. - + Der qbs-Prozess konnte nicht gestartet werden. The qbs process sent unexpected data. - + Der qbs-Prozess hat unerwartete Daten gesendet. The qbs API level is not compatible with what %1 expects. %1 == "Qt Creator" or "Qt Design Studio" - + Der qbs-API-Level ist nicht mit dem von %1 erwarteten kompatibel. Request timed out. - + Zeitüberschreitung bei der Anfrage. Failed to load qbs build graph. - + Der qbs-Build-Graph konnte nicht geladen werden. The qbs session is not in a valid state. - + Die qbs-Sitzung ist in keinem gültigen Zustand. Failed to update files in Qbs project: %1. The affected files are: %2 - + Das Aktualisieren von Dateien im Qbs-Projekt ist fehlgeschlagen: %1. +Die betroffenen Dateien sind: + %2 From 5caa01f7574fedbc30a8b7e0f693d51fe1c023bb Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 13 Jul 2023 13:11:37 +0200 Subject: [PATCH 079/101] German translation: iOS Change-Id: I960bd32c746b05712c7e8df81c8c6dedaefc934b Reviewed-by: Christian Stenger Reviewed-by: --- share/qtcreator/translations/qtcreator_de.ts | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index aa352935df3..6cc0b64bf74 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -33163,7 +33163,7 @@ Fehler: %5 Team: %1 App ID: %2 Expiration date: %3 - Team: %1 + Team: %1 App-ID: %2 Ablaufdatum: %3 @@ -33197,83 +33197,83 @@ Ablaufdatum: %3 iOS Settings - iOS-Einstellungen + iOS-Einstellungen Reset - Zurücksetzen + Zurücksetzen Automatically manage signing - Signieren automatisch ausführen + Signieren automatisch verwalten Development team: - Entwicklerteam: + Entwicklerteam: Provisioning profile: - Provisioning-Profil: + Provisioning-Profil: Default - Vorgabe + Vorgabe None - Keine + Keine Development team is not selected. - Es ist kein Entwicklerteam ausgewählt. + Es ist kein Entwicklerteam ausgewählt. Provisioning profile is not selected. - Es ist kein Provisioning-Profil ausgewählt. + Es ist kein Provisioning-Profil ausgewählt. Using default development team and provisioning profile. - Die Vorgaben für Entwicklerteam und Provisioning-Profil werden benutzt. + Die Vorgaben für Entwicklerteam und Provisioning-Profil werden benutzt. Development team: %1 (%2) - Entwicklerteam: %1 (%2) + Entwicklerteam: %1 (%2) Settings defined here override the QMake environment. - Hier gewählte Einstellungen überschreiben die QMake-Umgebung. + Hier gewählte Einstellungen überschreiben die QMake-Umgebung. %1 not configured. Use Xcode and Apple developer account to configure the provisioning profiles and teams. - %1 sind nicht konfiguriert. Benutzen Sie Xcode und Ihr Apple-Entwicklerkonto, um die Provisioning-Profile und Teams zu konfigurieren. + %1 sind nicht konfiguriert. Benutzen Sie Xcode und Ihr Apple-Entwicklerkonto, um die Provisioning-Profile und Teams zu konfigurieren. Development teams - Entwicklerteams + Entwicklerteams Provisioning profiles - Provisioning-Profile + Provisioning-Profile No provisioning profile found for the selected team. - Für das gewählte Team wurde kein Provisioning-Profil gefunden. + Für das gewählte Team wurde kein Provisioning-Profil gefunden. Provisioning profile expired. Expiration date: %1 - Das Provisioning-Profil ist abgelaufen. Ablaufdatum: %1 + Das Provisioning-Profil ist abgelaufen. Ablaufdatum: %1 Command: - + Kommando: Arguments: - Argumente: + Argumente: Reset to Default - Auf Vorgabe zurücksetzen + Auf Vorgabe zurücksetzen From 45f1b663bf25d589ecd4e9d2963ce71538cc55e6 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 10 Jul 2023 16:25:40 +0200 Subject: [PATCH 080/101] German translation: Autotest Change-Id: I51b84a773247aebb59705680e1dc81b19da0b80e Reviewed-by: Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 267 ++++++++++--------- 1 file changed, 135 insertions(+), 132 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 6cc0b64bf74..7a8f093fac7 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -11094,7 +11094,7 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube Omit run configuration warnings - Laufzeitkonfigurationsmeldungen auslassen + Ausführungskonfigurationsmeldungen auslassen Limit result output @@ -11102,31 +11102,31 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube Limit result description: - + Beschreibung der Resultate begrenzen: Limit number of lines shown in test result tooltip and description. - + Beschränkt die Anzahl der Zeilen, die im Tooltip und der Beschreibung von Testergebnissen angezeigt werden. Open results when tests start - + "Testergebnisse" beim Starten von Tests öffnen Displays test results automatically when tests are started. - + Öffnet "Testergebnisse" automatisch, wenn Tests gestartet werden. Open results when tests finish - + "Testergebnisse" beim Beenden von Tests öffnen Displays test results automatically when tests are finished. - + Öffnet "Testergebnisse" automatisch, wenn Tests beendet werden. Displays test results only if the test run contains failed, fatal or unexpectedly passed tests. - + Öffnet "Testergebnisse" nur, wenn der Testlauf durchgefallene, fatale oder unerwartet bestandene Tests enthält. Automatically scroll results @@ -11138,15 +11138,15 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube No active test frameworks or tools. - + Keine aktiven Test-Frameworks oder -Werkzeuge. Mixing test frameworks and test tools. - + Gemischte Test-Frameworks und -Werkzeuge. Mixing test frameworks and test tools can lead to duplicating run information when using "Run All Tests", for example. - + Test-Frameworks und -Werkzeuge im gleichen Projekt zu mischen, kann zum Beispiel zu duplizierter Information beim Nutzen von "Alle Tests ausführen" führen. Timeout: @@ -11228,15 +11228,15 @@ Warnung: Dies ist eine experimentelle Funktion und könnte dazu führen, dass di Active frameworks: - + Aktive Frameworks: Automatically run tests after build - + Tests automatisch nach dem Erstellen ausführen None - Keine + Keine All @@ -11448,11 +11448,11 @@ Ausführbare Datei: %2 unexpected passes - unerwartete Erfolge + unerwartet bestanden expected fails - erwartete Fehlschläge + erwartet durchgefallen fatals @@ -11460,7 +11460,7 @@ Ausführbare Datei: %2 blacklisted - indiziert + blacklisted skipped @@ -11484,15 +11484,15 @@ Ausführbare Datei: %2 Run This Test Without Deployment - + Diesen Test ohne Deployment ausführen Debug This Test Without Deployment - + Diesen Test ohne Deployment debuggen Run This Test - Diesen Test starten + Diesen Test ausführen Debug This Test @@ -11642,67 +11642,67 @@ Dies könnte Probleme während der Ausführung verursachen. Number of resamples for bootstrapping. - + Anzahl der Resamples für das Bootstrapping. ms - ms + ms Abort after - + Abbrechen nach Aborts after the specified number of failures. - + Bricht nach der angegebenen Anzahl Fehlschlägen ab. Benchmark samples - + Benchmark-Samples Number of samples to collect while running benchmarks. - + Anzahl der beim Ausführen von Benchmarks zu sammelnden Samples. Benchmark resamples - + Benchmark-Resamples Number of resamples used for statistical bootstrapping. - + Anzahl der für statistisches Bootstrapping benutzten Resamples. Confidence interval used for statistical bootstrapping. - + Für das statistische Bootstrapping benutzte Konfidenzinterval. Benchmark confidence interval - + Benchmark-Konfidenzinterval Benchmark warmup time - + Benchmark-Warmlaufzeit Warmup time for each test. - + Die Warmlaufzeit für jeden Test. Disable analysis - + Analyse deaktivieren Disables statistical analysis and bootstrapping. - + Deaktiviert die statistische Analyse und das Bootstrapping. Show success - + Erfolge anzeigen Show success for tests. - + Testerfolge anzeigen. Turns failures into debugger breakpoints. @@ -11710,27 +11710,27 @@ Dies könnte Probleme während der Ausführung verursachen. Skip throwing assertions - + Assertions auf geworfene Ausnahmen überspringen Skips all assertions that test for thrown exceptions. - + Überspringt alle Assertions, die auf geworfene Ausnahmen testen. Visualize whitespace - + Leerzeichen darstellen Makes whitespace visible. - + Macht Leerzeichen sichtbar. Warn on empty tests - + Bei leeren Tests warnen Warns if a test section does not check any assertion. - + Warnt, wenn ein Testabschnitt keine Assertions prüft. Break on failure while debugging @@ -11770,79 +11770,79 @@ Dies könnte Probleme während der Ausführung verursachen. Output on failure - + Ausgabe bei Fehlschlag Output mode - + Ausgabemodus Default - Vorgabe + Vorgabe Verbose - Ausführlich + Ausführlich Very Verbose - + Sehr ausführlich Repetition mode - + Wiederholungsmodus Until Fail - + Bis zu Fehlschlag Until Pass - + Bis zu Erfolg After Timeout - + Nach Zeitüberschreitung Count - Anzahl + Anzahl Number of re-runs for the test. - + Anzahl der Wiederholungen des Tests. Schedule random - + Zufällig planen Stop on failure - + Bei Fehlschlag anhalten Run tests in parallel mode using given number of jobs. - + Tests in der angegebenen Anzahl parallel ausführen. Jobs - + Jobs Test load - + Testauslastung Try not to start tests when they may cause CPU load to pass a threshold. - + Versucht, keine neuen Tests zu starten, wenn dies die CPU-Last über einen Schwellenwert erhöhen könnte. Threshold - Grenze + Schwellenwert CTest - + CTest Repeat tests @@ -11850,15 +11850,15 @@ Dies könnte Probleme während der Ausführung verursachen. Run in parallel - + Parallel ausführen Log format: - + Protokollformat: Report level: - + Report-Stufe: Seed: @@ -11866,39 +11866,39 @@ Dies könnte Probleme während der Ausführung verursachen. A seed of 0 means no randomization. A value of 1 uses the current time, any other value is used as random seed generator. - + Ein Startwert von 0 bedeutet keine Randomisierung. Ein Wert von 1 benutzt die aktuelle Zeit, jeder andere Wert wird als Startwert für Zufallszahlen benutzt. Randomize - + Randomisieren Randomize execution order. - + Ausführungsreihenfolge randomisieren. Catch system errors - + Systemfehler auffangen Catch or ignore system errors. - + Systemfehler auffangen oder ignorieren. Floating point exceptions - + Gleitkomma-Ausnahmen Enable floating point exception traps. - + Aktiviert das Auffangen von Ausnahmen für Gleitkommazahlen. Detect memory leaks - + Speicherlecks feststellen Enable memory leak detection. - + Aktiviert das Feststellen von Speicherlecks. A seed of 0 generates a seed based on the current timestamp. @@ -11956,24 +11956,25 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog Limit warnings - + Warnungen einschränken Set the maximum number of warnings. 0 means that the number is not limited. - + Legt die Höchstzahl an Warnungen fest. 0 bedeutet, dass die Anzahl nicht begrenzt ist. Unlimited - + Unbegrenzt Check for derived Qt Quick tests - + Auf abgeleitete Qt Quick-Tests überprüfen Search for Qt Quick tests that are derived from TestCase. Warning: Enabling this feature significantly increases scan time. - + Sucht nach Qt Quick-Tests, die von TestCase abgeleitet sind. +Achtung: Dies erhöht die zum Durchsuchen benötigte Zeit erheblich. Benchmark Metrics @@ -12065,11 +12066,11 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer. Run &All Tests - Starte &alle Tests + &Alle Tests ausführen Run All Tests - + Alle Tests ausführen Ctrl+Meta+T, Ctrl+Meta+A @@ -12081,23 +12082,23 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer. Run All Tests Without Deployment - + Alle Tests ohne Deployment ausführen Ctrl+Meta+T, Ctrl+Meta+E - + Ctrl+Meta+T, Ctrl+Meta+E Alt+Shift+T,Alt+E - + Alt+Shift+T,Alt+E &Run Selected Tests - Sta&rte ausgewählte Tests + Ausgewählte Tests ausfüh&ren Run Selected Tests - + Ausgewählte Tests ausführen Ctrl+Meta+T, Ctrl+Meta+R @@ -12109,11 +12110,11 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer. Run Selected Tests Without Deployment - + Ausgewählte Tests ohne Deployment ausführen Run Failed Tests - + Fehlgeschlagene Tests ausführen Ctrl+Meta+T, Ctrl+Meta+F @@ -12121,23 +12122,23 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer. Run Tests for Current File - + Tests für die aktuelle Datei ausführen &Run Selected Tests Without Deployment - + Ausgewählte Tests ohne Deployment ausfüh&ren Ctrl+Meta+T, Ctrl+Meta+W - + Ctrl+Meta+T, Ctrl+Meta+W Alt+Shift+T,Alt+W - + Alt+Shift+T,Alt+W Run &Failed Tests - + &Fehlgeschlagene Tests ausführen Alt+Shift+T,Alt+F @@ -12145,15 +12146,15 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer. Run Tests for &Current File - + Tests für die aktuelle &Datei ausführen Ctrl+Meta+T, Ctrl+Meta+C - + Ctrl+Meta+T, Ctrl+Meta+C Alt+Shift+T,Alt+C - + Alt+Shift+T,Alt+C Re&scan Tests @@ -12169,15 +12170,15 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer. Run Test Under Cursor Without Deployment - + Tests unter Einfügemarke ohne Deployment ausführen Debug Test Under Cursor Without Deployment - + Tests unter Einfügemarke ohne Deployment debuggen Cannot debug multiple tests at once. - + Debuggen von mehreren Tests gleichzeitig ist nicht möglich. Selected test was not found (%1). @@ -12193,49 +12194,51 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer. Executing test module %1 - + Führe Test-Modul %1 aus Test execution took %1. - Testausführung benötigte %1. + Testausführung benötigte %1. Test suite execution took %1. - + Test-Suite-Ausführung benötigte %1. Test module execution took %1. - + Test-Modul-Ausführung benötigte %1. %1 failures detected in %2. - + %1 Fehlschläge in %2 gefunden. %1 tests passed. - + %1 Tests bestanden. No errors detected. - + Keine Fehler festgestellt. Running tests exited with %1. - + Ausführung von Tests wurde mit Rückgabewert %1 beendet. Executable: %1 - + Ausführbare Datei: %1 Running tests failed. %1 Executable: %2 - + Ausführung von Tests fehlgeschlagen. +%1 +Ausführbare Datei: %2 Running tests without output. - + Ausführung von Tests ohne Ausgabe. parameterized @@ -12255,97 +12258,97 @@ Executable: %2 Catch Test - + Catch Test Exception: - + Ausnahme: Executing %1 "%2"... - + Führe %1 "%2" aus... %1 "%2" passed. - + %1 "%2" bestanden. Expression passed. - + Ausdruck bestanden. Finished executing %1 "%2". - + Ausführung von %1 "%2" beendet. Expression failed: %1 - + Ausdruck fehlgeschlagen: %1 Google Test - Google Test + Google Test Enable or disable grouping of test cases by folder or GTest filter. See also Google Test settings. - Gruppierung von Testfällen nach Verzeichnis oder GTest-Filter ein- oder ausschalten. + Gruppierung von Testfällen nach Verzeichnis oder GTest-Filter ein- oder ausschalten. Siehe auch die Einstellungen für Google Test. <matching> - <passend> + <passend> <not matching> - <nicht passend> + <nicht passend> Change GTest filter in use inside the settings. - Ändern Sie den verwendeten GTest-Filter in den Einstellungen. + Ändern Sie den verwendeten GTest-Filter in den Einstellungen. typed - typisiert + typisiert Qt Test - Qt Test + Qt Test <p>Multiple testcases inside a single executable are not officially supported. Depending on the implementation they might get executed or not, but never will be explicitly selectable.</p> - + <p>Mehrere Testfälle in der gleichen ausführbaren Datei werden nicht offiziell unterstützt. Abhängig von der Implementation werden sie möglicherweise ausgeführt oder auch nicht, aber sie werden niemals explizit auswählbar sein.</p> inherited - vererbt + vererbt multiple testcases - + mehrere Testfälle Quick Test - Quick Test + Quick Test <unnamed> - <unbenannt> + <unbenannt> Give all test cases a name to ensure correct behavior when running test cases and to be able to select them - + Geben Sie allen Testfällen einen Namen, um korrektes Verhalten sicherzustellen und sie auswählen zu können %1 (none) - %1 (keine) + %1 (keine) Auto Test - + Auto Test Running tests for "%1". - + Führe Tests für "%1" aus. From 0effdb3f2288ebf902b8e59f7f12fd78b3db51d8 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 13 Jul 2023 12:03:41 +0200 Subject: [PATCH 081/101] German translation: CtfVisualizer Change-Id: I2aa3538942f21a65936da59624b88cfdfbd743c2 Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 63 ++++++++++---------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 7a8f093fac7..244f28ef9ca 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -22423,23 +22423,23 @@ Flags: %3 Percentage - + Prozent Minimum Time - + Minimale Zeit Average Time - + Durchschnittliche Zeit Maximum Time - + Maximale Zeit Stack Level %1 - + Stack-Level %1 Value @@ -22447,35 +22447,35 @@ Flags: %3 Min - + Min Max - + Max Start - + Anfang Wall Duration - + Tatsächliche Dauer Unfinished - + Unvollendet true - + wahr Thread %1 - + Thread %1 Categories - + Kategorien Arguments @@ -22483,43 +22483,43 @@ Flags: %3 Instant - + Instant Scope - + Gültigkeitsbereich global - + global process - + Prozess thread - + Thread Return Arguments - + Rückgabeargument Chrome Trace Format Viewer - + Chrome Trace-Format-Betrachter Load JSON File - + JSON-Datei laden Restrict to Threads - + Auf Threads beschränken Timeline - + Zeitleiste Reset Zoom @@ -22531,36 +22531,37 @@ Flags: %3 Load Chrome Trace Format File - + Chrome Trace-Format-Datei laden JSON File (*.json) - + JSON-Datei (*.json) The file does not contain any trace data. - + Die Datei enthält keine Trace-Daten. Loading CTF File - + Lade CTF-Datei CTF Visualizer - + CTF-Betrachter Cannot read the CTF file. - + Die CTF-Datei kann nicht gelesen werden. The trace contains threads with stack depth > 512. Do you want to display them anyway? - + Die Trace-Daten enthalten Threads mit einer Stack-Tiefe größer als 512. +Möchten Sie die Daten trotzdem anzeigen? Chrome Trace Format Visualizer - + Chrome Trace-Format-Visualisierer From 94fc55882014ae442f740ab292d1b18bcade0c86 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 14 Jul 2023 11:04:30 +0200 Subject: [PATCH 082/101] Update qbs submodule to HEAD of 2.1 branch Change-Id: I55fe2b4a6afa56fb01eba6758296f4d076b2fc5b Reviewed-by: Christian Stenger --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 2e6eb75c76c..d75d1e8f1a1 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 2e6eb75c76c2d042eb07a8e6bcb4aa03b8843205 +Subproject commit d75d1e8f1a18fd77ec9b80724c6d30ad6b8e064e From eb7c645ee8adbd869704648eb6af4596b3b57c56 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 14 Jul 2023 10:56:40 +0200 Subject: [PATCH 083/101] COIN: Avoid usage of download/master.qt.io It has issues with download speeds leading to timeouts Change-Id: I1ab2eb4a2e1959c0147dd56411c28c4b4604eb51 Reviewed-by: Jarek Kobus Reviewed-by: Qt CI Bot --- coin/instructions/common_environment.yaml | 2 +- coin/instructions/provision.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index bafbb59b058..1fec2c793a6 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -7,7 +7,7 @@ instructions: variableValue: "RelWithDebInfo" - type: EnvironmentVariable variableName: LLVM_BASE_URL - variableValue: https://master.qt.io/development_releases/prebuilt/libclang/libclang-release_16.0.2-based + variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_16.0.2-based - type: EnvironmentVariable variableName: QTC_QT_BASE_URL variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.1-released/Qt" diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml index 14e6fb1a239..7b84c6e3baa 100644 --- a/coin/instructions/provision.yaml +++ b/coin/instructions/provision.yaml @@ -52,7 +52,7 @@ instructions: - type: ChangeDirectory directory: "{{.BuildDir}}/tqtc-qtsdk/packaging_tools" - 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 https://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 https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}" executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution maxTimeInSeconds: 3600 maxTimeBetweenOutput: 360 @@ -72,7 +72,7 @@ instructions: property: host.os equals_value: MacOS - type: ExecuteCommand - command: "python -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}} --opengl32sw7z https://master.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z https://master.qt.io/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z https://ci-files02-hki.ci.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}" + command: "python -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}} --opengl32sw7z https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z https://ci-files02-hki.ci.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}" executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution maxTimeInSeconds: 3600 maxTimeBetweenOutput: 360 From 1b1545e97c2693eb23f08b373bbd214d79fa1bdd Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 14 Jul 2023 11:56:12 +0200 Subject: [PATCH 084/101] German translation: Autotools, ClearCase, Coco, CompilationDb, Conan Change-Id: I37041c9912125d91d9686ba81722eb60b1b94ad4 Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 50 ++++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 244f28ef9ca..c14aabcb385 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -12355,46 +12355,46 @@ Siehe auch die Einstellungen für Google Test. QtC::AutotoolsProjectManager Arguments: - Argumente: + Argumente: Configuration unchanged, skipping autogen step. - Unveränderte Konfiguration, autogen-Schritt wird übersprungen. + Unveränderte Konfiguration, autogen-Schritt wird übersprungen. Autogen Display name for AutotoolsProjectManager::AutogenStep id. - Autogen + Autogen Configuration unchanged, skipping autoreconf step. - Unveränderte Konfiguration, autoreconf-Schritt wird übersprungen. + Unveränderte Konfiguration, autoreconf-Schritt wird übersprungen. Autoreconf Display name for AutotoolsProjectManager::AutoreconfStep id. - Autoreconf + Autoreconf Autotools Manager - Autotools-Verwaltung + Autotools-Verwaltung Configuration unchanged, skipping configure step. - Unveränderte Konfiguration, configure-Schritt wird übersprungen. + Unveränderte Konfiguration, configure-Schritt wird übersprungen. Configure Display name for AutotoolsProjectManager::ConfigureStep id. - Konfigurieren + Configure Parsing %1 in directory %2 - Werte %1 im Verzeichnis %2 aus + Werte %1 im Verzeichnis %2 aus Parsing directory %1 - Werte Verzeichnis %1 aus + Werte Verzeichnis %1 aus @@ -16604,19 +16604,19 @@ Setzen Sie erst eine gültige ausführbare Datei. Close Check In Editor - + Check-In-Editor schließen Closing this editor will abort the check in. - + Wenn Sie diesen Editor schließen, wird der Check-In abgebrochen. Cannot check in. - + Check-In fehlgeschlagen. Cannot check in: %1. - + Check-In fehlgeschlagen: %1. Do you want to undo the check out of "%1"? @@ -16719,23 +16719,23 @@ Setzen Sie erst eine gültige ausführbare Datei. QtC::Coco Select a Squish Coco CoverageBrowser Executable - + Wählen Sie eine ausführbare Datei für den Squish-Coco-CoverageBrowser CoverageBrowser: - + CoverageBrowser: Coco instrumentation files (*.csmes) - + Coco-Instrumentierungsdateien (*.csmes) Select a Squish Coco Instrumentation File - + Wählen Sie eine Squish-Coco-Instrumentierungsdatei CSMes: - + CSMes: @@ -16933,30 +16933,30 @@ Setzen Sie erst eine gültige ausführbare Datei. Change Root Directory - + Wurzelverzeichnis ändern QtC::Conan Conan install - + Mit Conan installieren Conan file: - + Conan-Datei: Enter location of conanfile.txt or conanfile.py. - + Geben Sie den Ort der Datei conanfile.txt oder conanfile.py an. Additional arguments: - Zusätzliche Argumente: + Zusätzliche Argumente: Run conan install - + Conan install ausführen From 9d5b442e6e0714da36cf6d32f8b3cd493393f940 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 14 Jul 2023 11:47:53 +0200 Subject: [PATCH 085/101] Examples: Add new/renamed categories for Qt 6.5.3 to sorting info Change-Id: I565c8f47219f462c0d37504f6a97975e11504876 Reviewed-by: Christian Stenger Reviewed-by: Qt CI Bot Reviewed-by: Leena Miettinen --- src/plugins/qtsupport/examplesparser.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/plugins/qtsupport/examplesparser.cpp b/src/plugins/qtsupport/examplesparser.cpp index d115dcf3fe0..9093241001e 100644 --- a/src/plugins/qtsupport/examplesparser.cpp +++ b/src/plugins/qtsupport/examplesparser.cpp @@ -306,15 +306,19 @@ expected_str> parseExamples(const QByteArray &manifestData, Q_GLOBAL_STATIC_WITH_ARGS(QList, defaultOrder, {QStringList() << "Application Examples" - << "Desktop" - << "Mobile" - << "Embedded" - << "Graphics" - << "Input/Output" - << "Connectivity" - << "Networking" - << "Positioning & Location" - << "Internationalization"}); + << "Desktop" + << "Mobile" + << "Embedded" + << "Graphics & Multimedia" + << "Graphics" + << "Data Visualization & 3D" + << "Data Processing & I/O" + << "Input/Output" + << "Connectivity" + << "Networking" + << "Positioning & Location" + << "Web Technologies" + << "Internationalization"}); static bool sortByHighlightedAndName(ExampleItem *first, ExampleItem *second) { From dc01c79203fe37f68ce1f0e63f322d35881e1cbf Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Fri, 14 Jul 2023 14:30:05 +0200 Subject: [PATCH 086/101] CMakePM: Use staging dir only when selected Fixes: QTCREATORBUG-29223 Change-Id: Ibc31b73ddda4f3906929ec1a4ff13eca84a704c8 Reviewed-by: hjk --- src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index c5b130dbecd..94f2bf912d6 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -245,7 +245,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) : env.set("NINJA_STATUS", ninjaProgressString + "%o/sec] "); env.modify(m_userEnvironmentChanges); - if (m_useStaging) + if (m_useStaging && m_useStaging->value()) env.set("DESTDIR", currentStagingDir()); }); From 955fa48b41b948b905fc18b623035483dd8d6858 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 17 Jul 2023 10:29:07 +0200 Subject: [PATCH 087/101] Changelog: Fix documentation links It is doc.qt.io, not docs.qt.io Change-Id: I3487b3634cfc0f960f0a34456742f1ab7616f37a Reviewed-by: Leena Miettinen --- dist/changelog/changes-11.0.0.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/changelog/changes-11.0.0.md b/dist/changelog/changes-11.0.0.md index 916c92954e4..8b1330dae7a 100644 --- a/dist/changelog/changes-11.0.0.md +++ b/dist/changelog/changes-11.0.0.md @@ -26,7 +26,7 @@ What's new? You can open markdown (.md) files for editing or select `File > New File > General > Markdown File` to create a new file. -([Documentation](https://docs.qt.io/qtcreator/creator-markdown-editor.html)) +([Documentation](https://doc.qt.io/qtcreator/creator-markdown-editor.html)) ### Terminal @@ -38,7 +38,7 @@ shells, colors, and fonts. To use an external terminal, deselect the `Use internal terminal` check box in `Preferences > Terminal`. -([Documentation](https://docs.qt.io/qtcreator/creator-reference-terminal-view.html)) +([Documentation](https://doc.qt.io/qtcreator/creator-reference-terminal-view.html)) ### Copilot @@ -48,7 +48,7 @@ suggest code in the `Edit` mode. To set Copilot preferences, select `Preferences > Copilot`. -([Documentation](https://docs.qt.io/qtcreator/creator-copilot.html)) +([Documentation](https://doc.qt.io/qtcreator/creator-copilot.html)) ### vcpkg @@ -64,7 +64,7 @@ project. Edit manifest files in the manifest editor. To search for packages to add to the file, select the `Search Package` button on the manifest editor toolbar. -([Documentation](https://docs.qt.io/qtcreator/creator-vcpkg.html)) +([Documentation](https://doc.qt.io/qtcreator/creator-vcpkg.html)) ### Axivion @@ -73,7 +73,7 @@ and link a project to an Axivion project in the project settings, Qt Creator shows annotations of the latest run in the editors and allows you to view some details on the issues. -([Documentation](https://docs.qt.io/qtcreator/creator-axivion.html)) +([Documentation](https://doc.qt.io/qtcreator/creator-axivion.html)) General ------- @@ -171,7 +171,7 @@ Editing * Fixed that too many progress indicators could be created ([QTCREATORBUG-29224](https://bugreports.qt.io/browse/QTCREATORBUG-29224)) - ([Documentation](https://docs.qt.io/qtcreator/creator-python-development.html)) + ([Documentation](https://doc.qt.io/qtcreator/creator-python-development.html)) ### Meson @@ -211,7 +211,7 @@ Projects * Presets * Added `Build > Reload CMake Presets` to reload CMake presets after making changes to them - ([Documentation](https://docs.qt.io/qtcreator/creator-build-settings-cmake-presets.html)) + ([Documentation](https://doc.qt.io/qtcreator/creator-build-settings-cmake-presets.html)) * Fixed that presets were not visible in the `Projects` view ([QTCREATORBUG-28966](https://bugreports.qt.io/browse/QTCREATORBUG-28966)) * Fixed the type handling of the `architecture` and `toolset` fields From 0db2beeff9e70b34990c0e6fadc387512a12faed Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 14 Jul 2023 15:02:24 +0200 Subject: [PATCH 088/101] Cmake: Make line edit in formatter settings editable again ... and improve layout a bit Change-Id: Ib1f7626259ca59190804faab5e2f453e8520de58 Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakeformatter.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp index dca6d47e203..8a727ba7942 100644 --- a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp @@ -60,10 +60,12 @@ public: autoFormatOnlyCurrentProject.setSettingsKey("autoFormatOnlyCurrentProject"); autoFormatOnlyCurrentProject.setDefaultValue(true); autoFormatOnlyCurrentProject.setLabelText(Tr::tr("Restrict to files contained in the current project")); + autoFormatOnlyCurrentProject.setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBox); autoFormatMime.setSettingsKey("autoFormatMime"); autoFormatMime.setDefaultValue("text/x-cmake"); autoFormatMime.setLabelText(Tr::tr("Restrict to MIME types:")); + autoFormatMime.setDisplayStyle(StringAspect::LineEditDisplay); setLayouter([this] { using namespace Layouting; @@ -73,9 +75,12 @@ public: Group { title(Tr::tr("Automatic Formatting on File Save")), autoFormatOnSave.groupChecker(), - Form { - autoFormatMime, br, - Span(2, autoFormatOnlyCurrentProject) + // Conceptually, that's a Form, but this would look odd: + // xxxxxx [____] + // [x] xxxxxxxxxxxxxx + Column { + Row { autoFormatMime }, + autoFormatOnlyCurrentProject } }, st From 2172ffa33fc4945c47177a1af5a999272787ac99 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 13 Jul 2023 17:01:57 +0200 Subject: [PATCH 089/101] Doc: Fix navigation links from how-to and reference topics in QDS Manual Change-Id: Ie3ea9be3b62c6a7da91debcd9b28e422d5bc7dd6 Reviewed-by: Eike Ziller Reviewed-by: Pranta Ghosh Dastider --- .../src/howto/creator-how-to-macos.qdoc | 4 +++- .../creator-how-to-set-high-dpi-scaling.qdoc | 4 +++- .../creator-how-to-switch-ui-themes.qdoc | 4 +++- .../src/howto/creator-how-to-view-images.qdoc | 8 ++++++-- .../creator-how-to-view-output.qdoc | 1 + .../creator-reference-output-views.qdoc | 19 +++++++++++++++++++ 6 files changed, 35 insertions(+), 5 deletions(-) diff --git a/doc/qtcreator/src/howto/creator-how-to-macos.qdoc b/doc/qtcreator/src/howto/creator-how-to-macos.qdoc index 639fb08f27f..30e5815efd9 100644 --- a/doc/qtcreator/src/howto/creator-how-to-macos.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-macos.qdoc @@ -5,8 +5,10 @@ \page creator-how-to-macos.html \if defined(qtcreator) \previouspage creator-how-tos.html - + \else + \previouspage creator-quick-tour.html \endif + \ingroup creator-how-to-ui \ingroup studio-how-to diff --git a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc index a52be5210fb..2beda1e8f5d 100644 --- a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc @@ -5,8 +5,10 @@ \page creator-how-to-set-high-dpi-scaling.html \if defined(qtcreator) \previouspage creator-how-tos.html - + \else + \previouspage creator-quick-tour.html \endif + \ingroup creator-how-to-ui \ingroup studio-how-to diff --git a/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc b/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc index 69fd7efef26..69272441a38 100644 --- a/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc @@ -5,8 +5,10 @@ \page creator-how-to-switch-ui-themes.html \if defined(qtcreator) \previouspage creator-how-tos.html - + \else + \previouspage creator-quick-tour.html \endif + \ingroup creator-how-to-ui \ingroup studio-how-to diff --git a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc index c6532aa8029..6a15f1274ad 100644 --- a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc @@ -5,8 +5,10 @@ \page creator-how-to-view-images.html \if defined(qtcreator) \previouspage creator-how-tos.html - + \else + \previouspage creator-quick-tour.html \endif + \ingroup creator-how-to-design \ingroup studio-how-to-image-viewer @@ -47,8 +49,10 @@ \page creator-how-to-export-svg-images.html \if defined(qtcreator) \previouspage creator-how-tos.html - + \else + \previouspage creator-quick-tour.html \endif + \ingroup creator-how-to-design \ingroup studio-how-to-image-viewer diff --git a/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc index db90bb39f0b..a6e4746e7c8 100644 --- a/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc +++ b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc @@ -5,6 +5,7 @@ \page creator-how-to-view-output.html \if defined(qtdesignstudio) \previouspage creator-quick-tour.html + \nextpage creator-reference-application-output-view.html \else \previouspage creator-how-tos.html \endif diff --git a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc index 60387532f7e..011a4bdfee7 100644 --- a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc +++ b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc @@ -9,7 +9,12 @@ /*! \page creator-reference-issues-view.html + \if defined(qtdesignstudio) + \previouspage creator-reference-compile-output-view.html + \nextpage creator-reference-search-results-view.html + \else \previouspage creator-reference.html + \endif \ingroup creator-reference-output-views \ingroup studio-reference-output-views @@ -117,7 +122,11 @@ /*! \page creator-reference-search-results-view.html + \if defined(qtdesignstudio) + \previouspage creator-reference-issues-view.html + \else \previouspage creator-reference.html + \endif \ingroup creator-reference-output-views \ingroup studio-reference-output-views @@ -143,7 +152,12 @@ /*! \page creator-reference-application-output-view.html + \if defined(qtdesignstudio) + \previouspage creator-how-to-view-output.html + \nextpage creator-reference-compile-output-view.html + \else \previouspage creator-reference.html + \endif \ingroup creator-reference-output-views \ingroup studio-reference-output-views @@ -185,7 +199,12 @@ /*! \page creator-reference-compile-output-view.html + \if defined(qtdesignstudio) + \previouspage creator-reference-application-output-view.html + \nextpage creator-reference-issues-view.html + \else \previouspage creator-reference.html + \endif \ingroup creator-reference-output-views \ingroup studio-reference-output-views From c0b29f28c05f78d48f3356db0265aa5d47ca7577 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 14 Jul 2023 14:03:51 +0200 Subject: [PATCH 090/101] German translation: Copilot Change-Id: I70abcdee4c38923d03450a43413e34782d2af160 Reviewed-by: Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 71 ++++++++++---------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index c14aabcb385..9c5e90abd00 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -16963,143 +16963,146 @@ Setzen Sie erst eine gültige ausführbare Datei. QtC::Copilot Sign In - + Anmelden A browser window will open. Enter the code %1 when asked. The code has been copied to your clipboard. - + Es wird sich ein Browser-Fenster öffnen. Geben Sie auf Anfrage den Code %1 ein. +Der Code wurde in die Zwischenablage kopiert. Login Failed - + Anmeldung fehlgeschlagen The login request failed: - + Die Anmeldung ist fehlgeschlagen: Select Previous Copilot Suggestion - + Vorangehenden Copilot-Vorschlag auswählen Select Next Copilot Suggestion - + Nächsten Copilot-Vorschlag auswählen Apply (%1) - + Anwenden (%1) Apply Word (%1) - + Wort anwenden (%1) %1 of %2 - %1 von %2 + %1 von %2 Enabling %1 is subject to your agreement and abidance with your applicable %1 terms. It is your responsibility to know and accept the requirements and parameters of using tools like %1. This may include, but is not limited to, ensuring you have the rights to allow %1 access to your code, as well as understanding any implications of your use of %1 and suggestions produced (like copyright, accuracy, etc.). - + Das Aktivieren von %1 unterliegt Ihrer Zustimmung und der Einhaltung der für Sie geltenden Bestimmungen für die Nutzung von %1. Es liegt in Ihrer Verantwortung, die Bedingungen und Parameter für die Nutzung von Werkzeugen wie %1 zu kennen und zu akzeptieren. Dies umfasst unter anderem, aber beschränkt sich nicht darauf, sicherzustellen, dass Sie das Recht haben, %1 Zugriff zu Ihrem Code zu geben, und dass Sie die Implikationen Ihrer Nutzung von %1 und der davon erstellten Vorschläge kennen (bzgl. Urheberrecht, Copyright, Genauigkeit, usw.). The Copilot plugin requires node.js and the Copilot neovim plugin. If you install the neovim plugin as described in %1, the plugin will find the agent.js file automatically. Otherwise you need to specify the path to the %2 file from the Copilot neovim plugin. Markdown text for the copilot instruction label - + Das Copilot-Plugin benötigt node.js und das Copilot-Plugin für Neovim. Wenn Sie das Neovim-Plugin wie in der %1 beschrieben installieren, findet das Plugin die Datei agent.js automatisch. + +Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim angeben. Note: - Hinweis: + Hinweis: Request Copilot Suggestion - + Vorschlag von Copilot anfordern Request Copilot suggestion at the current editor's cursor position. - + Fordert Vorschläge für die Cursorposition des aktuellen Editors von Copilot an. Show next Copilot Suggestion - + Nächsten Copilot-Vorschlag zeigen Cycles through the received Copilot Suggestions showing the next available Suggestion. - + Iteriert über die Vorschläge von Copilot und zeigt den nächsten verfügbaren Vorschlag. Show previos Copilot Suggestion - + Vorangehenden Copilot-Vorschlag zeigen Cycles through the received Copilot Suggestions showing the previous available Suggestion. - + Iteriert über die Vorschläge von Copilot und zeigt den vorangehenden verfügbaren Vorschlag. Disable Copilot - + Copilot deaktivieren Disable Copilot. - + Deaktiviere Copilot. Enable Copilot - + Copilot aktivieren Enable Copilot. - + Aktiviere Copilot. Toggle Copilot - + Copilot umschalten Copilot - + Copilot Enables the Copilot integration. - + Aktiviert die Copilot-Integration. Node.js path: - + Pfad zu Node.js: Node.js Path - + Pfad zu Node.js Select path to node.js executable. See https://nodejs.org/en/download/for installation instructions. - + Wählen Sie den Pfad zur ausführbaren node.js-Datei. Siehe auch https://nodejs.org/en/download/ für eine Installationsanleitung. Path to agent.js: - + Pfad zu agent.js: Agent.js path - + Pfad zu agent.js Select path to agent.js in Copilot Neovim plugin. See https://github.com/github/copilot.vim#getting-started for installation instructions. - + Wählen Sie den Pfad zur agent.js-Datei vom Copilot-Plugin für Neovim. Siehe auch https://github.com/github/copilot.vim#getting-started für eine Installationsanleitung. Auto Complete - Automatische Vervollständigung + Automatische Vervollständigung Request completions automatically - + Vervollständigung automatisch anfordern Automatically request suggestions for the current text cursor position after changes to the document. - + Fordert Vorschläge für die aktuelle Cursorposition nach Änderungen am Dokument automatisch an. From a86356ce8a38d24e1fee73225cbaf36c2ef83b39 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 18 Jul 2023 15:14:40 +0200 Subject: [PATCH 091/101] Squish: Fix menu handling on macOS Some menus inside QC have special numbering - but this only applies to Linux and Windows. On macOS we do not add this special numbering. Additionally this patch stabilizes the triggering of submenus. When they get triggered it takes a split of a second until the items inside the menu are usable. Let squish wait until the sub menu is fully present before trying to activate some of its items. Change-Id: I32c688a937ada1da07506d4ebd22730e4f2bcaef Reviewed-by: Marcus Tillmanns --- tests/system/shared/utils.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 6b99c8959da..2a17e0333c2 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -171,6 +171,10 @@ def invokeMenuItem(menu, item, *subItems): numberedPrefix = "%d | " for subItem in subItems: # we might have numbered sub items (e.g. "Recent Files") - these have this special prefix + # but on macOS we don't add these prefixes + if platform.system() == 'Darwin' and subItem.startswith(numberedPrefix): + subItem = subItem[5:] + if subItem.startswith(numberedPrefix): triggered = False for i in range(1, 10): @@ -186,7 +190,10 @@ def invokeMenuItem(menu, item, *subItems): "Function arguments: '%s', '%s', %s" % (menu, item, str(subItems))) break # we failed to trigger - no need to process subItems further else: + noAmpersandItem = item.replace('&', '') + waitForObject("{type='QMenu' title='%s'}" % noAmpersandItem, 2000) itemObject = waitForObjectItem(itemObject, subItem) + waitFor("itemObject.enabled", 2000) activateItem(itemObject) From 6614abe549cc9fa0e67c2cdad7149a5359106643 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 19 Jul 2023 09:14:30 +0200 Subject: [PATCH 092/101] SquishTests: Adapt to Python 3 A dict's values object is not a list as it had been in Python 2. Explicitly convert it. Change-Id: Iab54a5833b77c6890b108065657da3ff73c96f7f Reviewed-by: Marcus Tillmanns --- tests/system/suite_general/tst_default_settings/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index b1bf0b36d55..ce026e98d36 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -318,8 +318,8 @@ def __compareCompilers__(foundCompilers, expectedCompilers): isRegex = ".*?" in key or "[.0-9]+" in key if (((isRegex and re.match(key, list(currentFound.keys())[0], flags))) or currentFound.keys() == currentExp.keys()): - if ((isWin and os.path.abspath(currentFound.values()[0].lower()) - == os.path.abspath(currentExp.values()[0].lower())) + if ((isWin and os.path.abspath(list(currentFound.values())[0].lower()) + == os.path.abspath(list(currentExp.values())[0].lower())) or currentFound.values() == currentExp.values()): foundExp = True break From c9ff58d38be0d658891a603ac3c38ae553361f2c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 18 Jul 2023 12:22:49 +0200 Subject: [PATCH 093/101] German translation: Docker Change-Id: Idf6f26e2b2f0f4c803cebc7c0fe52ee22af96332 Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 107 ++++++++++--------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 9c5e90abd00..09639a89ccd 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -27557,216 +27557,217 @@ Versuchen Sie, das Projekt neu zu erstellen. QtC::Docker Checking docker daemon - + Überprüfe Docker-Daemon Path "%1" is not a directory or does not exist. - + Der Pfad "%1" ist kein Verzeichnis oder existiert nicht. Docker - + Docker Docker Image - + Docker Image Docker Image "%1" (%2) - + Docker Image "%1" (%2) Error starting remote shell. No container. - + Fehler beim Start der entfernten Shell. Kein Container. Error starting remote shell: %1 - + Fehler beim Start der entfernten Shell: %1 Open Shell in Container - + Shell in Container öffnen Docker daemon appears to be not running. Verify daemon is up and running and reset the Docker daemon in Docker device preferences or restart Qt Creator. - + Der Docker-Daemon scheint nicht zu laufen. Stellen Sie sicher, dass der Daemon ausgeführt wird, und setzen Sie den Docker-Daemon in den Einstellungen des Docker-Geräts zurück oder starten Sie Qt Creator neu. Docker Image Selection - + Auswahl des Docker-Image Show Unnamed Images - + Unbenannte Images anzeigen Loading ... - + Lade... Running "%1" - + Führe "%1" aus + Unexpected result: %1 - + Unerwartetes Ergebnis: %1 Done. - Fertig. + Fertig. Error: %1 - Fehler: %1 + Fehler: %1 Docker Device - + Docker-Gerät localSource: No mount point found for %1 - + localSource: Kein Einhängepunkt für %1 gefunden Repository: - Repository: + Repository: Tag: - + Tag: Image ID: - + Image ID: Daemon state: - + Daemon-Status: Clears detected daemon state. It will be automatically re-evaluated next time access is needed. - + Löscht den festgestellten Daemon-Status. Wird automatisch neu ausgewertet, wenn das nächste Mal Zugriff benötigt wird. Do not modify entry point - + Einstiegspunkt nicht ändern Prevents modifying the entry point of the image. Enable only if the image starts into a shell. - + Verhindert, dass der Einstiegspunkt des Image geändert wird. Aktivieren Sie dies nur, wenn das Image in eine Shell gestartet wird. Enable flags needed for LLDB - + Aktiviert Optionen, die für LLDB benötigt werden Adds the following flags to the container to allow LLDB to run: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined - + Fügt die folgenden Optionen zum Start des Containers hinzu, um das Ausführen von LLDB zu erlauben: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined Run as outside user - + Als Benutzer von außerhalb ausführen Uses user ID and group ID of the user running Qt Creator in the docker container. - + Verwendet im Docker-Container die Benutzer- und Gruppen-ID des Benutzers, der Qt Creator ausführt. Clangd Executable: - + Ausführbare Datei für Clangd: Paths to mount: - + Einzuhängende Pfade: Source directory list should not be empty. - + Die Liste der Quellverzeichnisse sollte nicht leer sein. Host directories to mount into the container - + Host-Verzeichnisse die in den Container eingehängt werden sollen Maps paths in this list one-to-one to the docker container. - + Ordnet Pfade in dieser Liste 1-zu-1 zum Docker-Container zu. Auto-detect Kit Items - + Kit-Einträge automatisch bestimmen Remove Auto-Detected Kit Items - + Automatisch bestimmte Kit-Einträge entfernen List Auto-Detected Kit Items - + Automatisch bestimmte Kit-Einträge anzeigen Search in PATH - + Im PATH suchen Search in Selected Directories - + In ausgewählten Verzeichnissen suchen Search in PATH and Additional Directories - + Im PATH und zusätzlichen Verzeichnissen suchen Semicolon-separated list of directories - + Eine durch Semikola getrennte Liste von Verzeichnissen Select the paths in the Docker image that should be scanned for kit entries. - + Wählen Sie die Verzeichnisse im Docker-Image, in denen nach Kit-Einträgen gesucht werden sollen. Docker daemon appears to be stopped. - + Der Docker-Daemon scheint angehalten zu sein. Docker daemon appears to be running. - + Der Docker-Daemon scheint zu laufen. Detection complete. - + Suche abgeschlossen. Search Locations: - + Zu durchsuchende Orte: Detection log: - + Suchprotokoll: Daemon state not evaluated. - + Daemon-Status nicht ermittelt. Docker daemon running. - + Docker-Daemon läuft. Docker daemon not running. - + Docker-Daemon läuft nicht. Docker CLI - + Docker CLI Command: - + Kommando: Configuration - Konfiguration + Konfiguration From 74801a52f2cc2a392f4643b2ff41fa0bf4461959 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 18 Jul 2023 14:12:02 +0200 Subject: [PATCH 094/101] German translation: GitLab Change-Id: I7efac2f2ef7ad5ce981de8cd33952597f5d940b9 Reviewed-by: Christian Stenger --- share/qtcreator/translations/qtcreator_de.ts | 132 +++++++++---------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 09639a89ccd..ab3fd12f001 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -31404,271 +31404,271 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. QtC::GitLab Clone Repository - + Repository klonen Specify repository URL, checkout path and directory. - + Geben Sie Repository-URL, Checkout-Pfad und Verzeichnis an. Repository - + Repository Path - Pfad + Pfad Path "%1" already exists. - + Der Pfad "%1" existiert bereits. Directory - Verzeichnis + Verzeichnis Recursive - Rekursiv + Rekursiv Clone - Klonen + Klonen User canceled process. - + Der Benutzer hat den Prozess abgebrochen. Cloning succeeded. - + Das Klonen war erfolgreich. Warning - Warnung + Warnung Cloned project does not have a project file that can be opened. Try importing the project as a generic project. - + Das geklonte Projekt enthält keine Projekt-Datei, die geöffnet werden kann. Versuchen Sie, das Projekt als generisches Projekt zu importieren. Open Project - Projekt öffnen + Projekt öffnen Choose the project file to be opened. - + Wählen Sie die zu öffnende Projekt-Datei. Cloning failed. - + Fehler beim Klonen. GitLab - + GitLab Search - Suche + Suche ... - ... + ... 0 - 0 + 0 Clone... - Klonen... + Klonen... Remote: - Remote: + Remote: Not logged in. - + Nicht eingeloggt. Insufficient access token. - + Ungenügendes Zugangstoken. Permission scope read_api or api needed. - + Es werden Rechte für read_api oder api benötigt. Check settings for misconfiguration. - + Überprüfen Sie die Einstellungen auf falsche Konfigurationen. Projects (%1) - + Projekte (%1) Using project access token. - + Benutze das Zugriffstoken des Projekts. Logged in as %1 - + Als %1 eingeloggt Id: %1 (%2) - + ID: %1 (%2) Certificate Error - Zertifikatsfehler + Zertifikatsfehler Server certificate for %1 cannot be authenticated. Do you want to disable SSL verification for this server? Note: This can expose you to man-in-the-middle attack. - Server-Zertifikat für %1 kann nicht authentifiziert werden. + Server-Zertifikat für %1 kann nicht authentifiziert werden. Möchten Sie die SSL-Verifikation für diesen Server abschalten? Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. Host: - Host: + Host: Description: - Beschreibung: + Beschreibung: Access token: - + Zugriffstoken: Port: - Port: + Port: HTTPS: - + HTTPS: Default: - Vorgabe: + Vorgabe: curl: - + curl: Edit... - Bearbeiten... + Bearbeiten... Edit current selected GitLab server configuration. - + Ausgewählte GitLab-Serverkonfiguration bearbeiten. Remove - + Entfernen Remove current selected GitLab server configuration. - + Entferne die ausgewählte GitLab-Serverkonfiguration. Add... - Hinzufügen... + Hinzufügen... Add new GitLab server configuration. - + Neue GitLab-Serverkonfiguration hinzufügen. Edit Server... - + Server bearbeiten... Modify - + Ändern Add Server... - + Server hinzufügen... Add - Hinzufügen + Hinzufügen GitLab... - + GitLab... Error - Fehler + Fehler Invalid GitLab configuration. For a fully functional configuration, you need to set up host name or address and an access token. Providing the path to curl is mandatory. - + Ungültige GitLab-Konfiguration. Für eine voll funktionsfähige Konfiguration müssen Sie den Namen des Hosts oder die Adresse und ein Zugriffstoken einrichten. Die Angabe des Pfads zu curl ist zwingend erforderlich. Guest - + Gast Reporter - + Reporter Developer - + Entwickler Maintainer - + Maintainer Owner - Autor + Eigentümer Linked GitLab Configuration: - + Verbundene GitLab-Konfiguration: Link with GitLab - + Mit GitLab verbinden Unlink from GitLab - + Von GitLab trennen Test Connection - + Verbindung testen Projects linked with GitLab receive event notifications in the Version Control output pane. - + Mit GitLab verbundene Projekte erhalten Ereignisbenachrichtigungen in der Ausgabe der Versionskontrolle. Remote host does not match chosen GitLab configuration. - + Der remote Host stimmt nicht mit der gewählten GitLab-Konfiguration überein. Accessible (%1). - + Zugreifbar (%1). Read only access. - + Schreibgeschützter Zugriff. Not a git repository. - + Kein Git-Repository. Local git repository without remotes. - + Lokales Git-Repository ohne Remotes. From 182104e013c65e1b190a6c0aa99e4bab7251e590 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 19 Jul 2023 15:32:31 +0200 Subject: [PATCH 095/101] SquishTests: Adapt to different texts on macOS Change-Id: Ie97003fd7de907d1a0f3ac71d6244dd68e2bf833 Reviewed-by: Marcus Tillmanns --- tests/system/suite_editors/tst_edit_externally/test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/system/suite_editors/tst_edit_externally/test.py b/tests/system/suite_editors/tst_edit_externally/test.py index b468b4ebe04..dea2f5d8ec6 100644 --- a/tests/system/suite_editors/tst_edit_externally/test.py +++ b/tests/system/suite_editors/tst_edit_externally/test.py @@ -26,7 +26,8 @@ def main(): mBox = ("{text?='The file * has been changed on disk. Do you want to reload it?' " "type='QMessageBox' unnamed='1' visible='1'}") popupText = ("

    The file %s has been changed on disk. Do you want to reload it?

    " - "

    The default behavior can be set in Edit > Preferences > Environment > System.

    ") + "

    The default behavior can be set in X > Preferences > Environment > System.

    ") + popupText = popupText.replace("X", "Qt Creator" if platform.system() == "Darwin" else "Edit") formerContent = None for i, currentFile in enumerate(files): From b44a7817b8dc3a7898ee6445d2c7494644b10797 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 19 Jul 2023 09:26:37 +0200 Subject: [PATCH 096/101] SquishTests: Handle codec problems Reading files depends on the system encoding and will return a bytes object instead of a str even for text files on some Windows setups. Handle this by explcitly converting to str if needed. Handle possible decoding issues by falling back to UTF8 encoding when running into decoding error while decoding on Windows. Change-Id: I8c1f24ff052710e4b1927399d54e321088e3b171 Reviewed-by: Marcus Tillmanns --- tests/system/shared/utils.py | 8 ++++++-- tests/system/suite_editors/tst_edit_externally/test.py | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 2a17e0333c2..8639c6e2651 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -611,8 +611,12 @@ def stringify(obj): if isinstance(obj, stringTypes): return obj if isinstance(obj, bytes): - tmp = obj.decode('cp1252') if platform.system() in ('Microsoft','Windows') else obj.decode() - return tmp + if not platform.system() in ('Microsoft', 'Windows'): + return obj.decode() + try: + return obj.decode('cp1252') + except UnicodeDecodeError: + return obj.decode('utf-8') class GitClone: diff --git a/tests/system/suite_editors/tst_edit_externally/test.py b/tests/system/suite_editors/tst_edit_externally/test.py index dea2f5d8ec6..e04ab19670a 100644 --- a/tests/system/suite_editors/tst_edit_externally/test.py +++ b/tests/system/suite_editors/tst_edit_externally/test.py @@ -39,7 +39,10 @@ def main(): test.fatal("Could not get the editor for '%s'" % currentFile, "Skipping this file for now.") continue + contentBefore = readFile(currentFile) + if not currentFile.endswith(".bin"): + contentBefore = stringify(contentBefore) if i % 2 == 0: # modify current file and store content for next modification formerContent = contentBefore From d53a743262aaf886f30ca67621896f5edb832d08 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 20 Jul 2023 07:22:24 +0200 Subject: [PATCH 097/101] SquishTests: Fix used short cut on macOS Modify used short cut on macOS again. This tends to break depending on OS version, underlying keyboard layout and maybe even more causes. Change-Id: I79b0e281128b8f779307782038aa9fb42510b633 Reviewed-by: Marcus Tillmanns --- tests/system/suite_HELP/tst_HELP02/test.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py index e7e201c4948..8b6c32b7ded 100644 --- a/tests/system/suite_HELP/tst_HELP02/test.py +++ b/tests/system/suite_HELP/tst_HELP02/test.py @@ -3,6 +3,14 @@ source("../../shared/qtcreator.py") +if platform.system() == 'Darwin': + keysToType = '' + expectedKeys = 'Cmd+Opt+A' +else: + keysToType = '' + expectedKeys = 'Ctrl+Alt+A' + + # test Qt Creator version information from file and dialog def getQtCreatorVersionFromDialog(): chk = re.search("(?<=Qt Creator)\s\d+.\d+.\d+[-\w]*", @@ -68,17 +76,16 @@ def setKeyboardShortcutForAboutQtC(): "visible='1' text~='(Stop Recording|Record)'}" % shortcutGB) shortcut = ("{container=%s type='Utils::FancyLineEdit' unnamed='1' visible='1' " "placeholderText='Enter key sequence as text'}" % shortcutGB) - expected = 'Ctrl+Opt+A' if platform.system() == 'Darwin' else 'Ctrl+Alt+A' clickButton(record) - nativeType("") - waitFor("_shortcutMatches_(shortcut, expected)", 5000) + nativeType(keysToType) + waitFor("_shortcutMatches_(shortcut, expectedKeys)", 5000) clickButton(record) - gotExpectedShortcut = _shortcutMatches_(shortcut, expected) + gotExpectedShortcut = _shortcutMatches_(shortcut, expectedKeys) if not gotExpectedShortcut and platform.system() == 'Darwin': test.warning("Squish Issue: shortcut was set to %s - entering it manually now" % waitForObject(shortcut).text) - replaceEditorContent(shortcut, expected) + replaceEditorContent(shortcut, expectedKeys) else: test.verify(gotExpectedShortcut, "Expected key sequence is displayed.") clickButton(waitForObject(":Options.OK_QPushButton")) @@ -97,7 +104,7 @@ def main(): waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 2000) except: nativeMouseClick(waitForObject(":Qt Creator_Core::Internal::MainWindow", 1000), 20, 20, 0, Qt.LeftButton) - nativeType("") + nativeType(keysToType) # verify qt creator version try: waitForObject(":About Qt Creator_Core::Internal::VersionDialog", 5000) From cd971160c3868bc13866ad709c27345b567eb229 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 20 Jul 2023 09:01:17 +0200 Subject: [PATCH 098/101] SquishTests: Adapt to different ui approach Using the window title property on macOS is not reliable as message boxes do not get any there. Use the expected text of the message box instead. Change-Id: I36dc865dcce6ba98643f0174887de12c197b3222 Reviewed-by: Marcus Tillmanns --- tests/system/objects.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index e69bd12677e..cc359d6b7fc 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -22,7 +22,7 @@ :Add Bookmark.treeView_QTreeView {type='QTreeView' unnamed='1' visible='1' window=':Add Bookmark_BookmarkDialog'} :Add Bookmark_BookmarkDialog {type='BookmarkDialog' unnamed='1' visible='1' windowTitle='Add Bookmark'} :Add to Version Control.No_QPushButton {text='No' type='QPushButton' unnamed='1' visible='1' window=':Add to Version Control_QMessageBox'} -:Add to Version Control_QMessageBox {type='QMessageBox' unnamed='1' visible='1' windowTitle='Add to Version Control'} +:Add to Version Control_QMessageBox {text~='Add the file\n.+\nto version control .+' type='QMessageBox' unnamed='1' visible='1'} :Analyzer Toolbar.AnalyzerManagerToolBox_QComboBox {container=':DebugModeWidget.Toolbar_QDockWidget' name='PerspectiveChooser' type='QComboBox' visible='1'} :Analyzer Toolbar.Clear_QToolButton {container=':DebugModeWidget.Toolbar_QDockWidget' toolTip='Discard data' type='QToolButton' unnamed='1' visible='1'} :Analyzer Toolbar.Elapsed:_QLabel {container=':DebugModeWidget.Toolbar_QDockWidget' text~='Elapsed: \\\\d+.\\\\d s' type='QLabel' unnamed='1' visible='1'} From 3da1adc442cb5674595e0fa3c3cdff7071d3444d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 20 Jul 2023 10:31:07 +0200 Subject: [PATCH 099/101] sdktool: Fix writing files Fix an error when copying the file operations to sdktool. resolveSymlinks was (basically) always returning an empty string. Instead it should return the first file path that is not a symlink. Amends bb4d9c92e77f44b55f06a8b8080b5f35d363a1f5 Change-Id: Id6bfcc3332c14f074ab635e11ca0536b5326dbb1 Reviewed-by: hjk --- src/tools/sdktool/sdkpersistentsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/sdktool/sdkpersistentsettings.cpp b/src/tools/sdktool/sdkpersistentsettings.cpp index 34b139e2324..7fda2d8d03c 100644 --- a/src/tools/sdktool/sdkpersistentsettings.cpp +++ b/src/tools/sdktool/sdkpersistentsettings.cpp @@ -130,7 +130,7 @@ static QString resolveSymlinks(QString current) while (links--) { const QFileInfo info(current); if (!info.isSymLink()) - return {}; + return current; current = info.symLinkTarget(); } return current; From a76f8cf4dc4abd97a68893a2b6bd08bc6c56b932 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 20 Jul 2023 08:54:40 +0200 Subject: [PATCH 100/101] Doc: Change Extending Qt Creator Manual \page to index.html It was extending-index.html to solve some issues that were caused when generating the manuals from the same sources, but those seem to have been solved. The name index.html was already used at doc.qt.io for version 10.0. Change-Id: I16c11d286107141f49cf28824cef998bd233d975 Reviewed-by: Eike Ziller Reviewed-by: Qt CI Bot --- doc/qtcreatordev/src/qtcreator-dev.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/qtcreatordev/src/qtcreator-dev.qdoc b/doc/qtcreatordev/src/qtcreator-dev.qdoc index 5e11b9e7b44..554d5dbb19a 100644 --- a/doc/qtcreatordev/src/qtcreator-dev.qdoc +++ b/doc/qtcreatordev/src/qtcreator-dev.qdoc @@ -1,8 +1,8 @@ -// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! - \page extending-index.html + \page index.html \title Extending Qt Creator Manual \QC is a cross-platform integrated development environment (IDE) tailored to From 6603c247d65c9e983f412480b6698684db93bc26 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 20 Jul 2023 11:24:05 +0200 Subject: [PATCH 101/101] Doc: Fix reference to an image whose format changed to WEBP Change-Id: I123af115096b17fdbe500af37f25704a45ad78a1 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/find/ifindfilter.cpp | 2 +- src/plugins/coreplugin/find/searchresultwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/find/ifindfilter.cpp b/src/plugins/coreplugin/find/ifindfilter.cpp index 85b8a68be80..66b7710586c 100644 --- a/src/plugins/coreplugin/find/ifindfilter.cpp +++ b/src/plugins/coreplugin/find/ifindfilter.cpp @@ -36,7 +36,7 @@ A common way to present the search results to the user, is to use the shared \uicontrol{Search Results} pane. - \image qtcreator-searchresults.png + \image qtcreator-search-results.webp {Search Results view} If you want to implement a find filter that is doing a file based text search, you should use \l Core::BaseTextFind, which already implements all diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index e2a83a71a0e..a096f452490 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -319,7 +319,7 @@ using namespace Core::Internal; \brief The SearchResultWindow class is the implementation of a commonly shared \uicontrol{Search Results} output pane. - \image qtcreator-searchresults.png + \image qtcreator-search-results.webp {Search Results view} Whenever you want to show the user a list of search results, or want to present UI for a global search and replace, use the single instance