From 1f445b2dffdcb9880ef686d969253d51ea0ce05f Mon Sep 17 00:00:00 2001 From: Pawel Polanski Date: Fri, 1 Apr 2011 16:52:57 +0200 Subject: [PATCH 01/18] Symbian: Fixed the 'Adapter start failed' bug Task-number: QTCREATORBUG-4325 Reviewed-by: Friedemann Kleint --- src/plugins/debugger/gdb/codagdbadapter.cpp | 11 ++++++++--- src/plugins/debugger/gdb/codagdbadapter.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/gdb/codagdbadapter.cpp b/src/plugins/debugger/gdb/codagdbadapter.cpp index 69dfaff8888..76892af8e91 100644 --- a/src/plugins/debugger/gdb/codagdbadapter.cpp +++ b/src/plugins/debugger/gdb/codagdbadapter.cpp @@ -127,7 +127,8 @@ CodaGdbAdapter::CodaGdbAdapter(GdbEngine *engine) : m_uid(0), m_verbose(0), m_firstResumableExeLoadedEvent(false), - m_registerRequestPending(false) + m_registerRequestPending(false), + m_firstHelloEvent(true) { m_bufferedMemoryRead = true; // Disable buffering if gdb's dcache is used. @@ -316,8 +317,11 @@ void CodaGdbAdapter::codaEvent(const CodaEvent &e) switch (e.type()) { case CodaEvent::LocatorHello: - m_codaDevice->sendLoggingAddListenerCommand(CodaCallback()); - startGdb(); // Commands are only accepted after hello + if (state() == EngineSetupRequested && m_firstHelloEvent) { + m_firstHelloEvent = false; + m_codaDevice->sendLoggingAddListenerCommand(CodaCallback()); + startGdb(); // Commands are only accepted after hello + } break; case CodaEvent::RunControlModuleLoadSuspended: // A module was loaded handleCodaRunControlModuleLoadContextSuspendedEvent( @@ -1027,6 +1031,7 @@ void CodaGdbAdapter::startAdapter() m_session.reset(); m_firstResumableExeLoadedEvent = true; m_tcfProcessId.clear(); + m_firstHelloEvent = true; // Retrieve parameters. const DebuggerStartParameters ¶meters = startParameters(); diff --git a/src/plugins/debugger/gdb/codagdbadapter.h b/src/plugins/debugger/gdb/codagdbadapter.h index 2af60e7bc5d..0e8c75c2e9a 100644 --- a/src/plugins/debugger/gdb/codagdbadapter.h +++ b/src/plugins/debugger/gdb/codagdbadapter.h @@ -199,6 +199,7 @@ private: bool m_registerRequestPending; QByteArray m_tcfProcessId; LocalGdbProcess m_gdbProc; + bool m_firstHelloEvent; }; } // namespace Internal From ff7513338189e8ea562061c84f2c05d1d90cedb4 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 1 Apr 2011 17:13:03 +0200 Subject: [PATCH 02/18] Qt: Make sure to import non-native pathes from ini Make sure to not import non-native pathes from our settings (from old versions of Qt Creator). We make sure to use only proper slashes nowadays. Task-number: QTCREATORBUG-4328 Reviewed-by: dt --- src/plugins/qt4projectmanager/qtversionmanager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 16810bb131d..6f50461576e 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -173,8 +173,9 @@ QtVersionManager::QtVersionManager() id, isAutodetected, autodetectionSource); - version->setSystemRoot(s->value("S60SDKDirectory").toString()); - version->setSbsV2Directory(s->value(QLatin1String("SBSv2Directory")).toString()); + // Make sure we do not import non-native separators from old Qt Creator versions: + version->setSystemRoot(QDir::fromNativeSeparators(s->value("S60SDKDirectory").toString())); + version->setSbsV2Directory(QDir::fromNativeSeparators(s->value(QLatin1String("SBSv2Directory")).toString())); // Update from pre-2.2: const QString mingwDir = s->value(QLatin1String("MingwDirectory")).toString(); From 5bb1ca68b0f7272de3aac99bcb25ff18a60cd00e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 1 Apr 2011 17:44:24 +0200 Subject: [PATCH 03/18] L10n: German translations for 2.2 (string freeze). --- share/qtcreator/translations/qtcreator_de.ts | 622 ++++++++++--------- 1 file changed, 325 insertions(+), 297 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 141432b800c..83aa575609d 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -318,18 +318,6 @@ Arguments Argumente - - Please specify the path to the CMake executable. No CMake executable was found in the path. - Bitte geben Sie den Pfad zu der ausführbaren Datei von cmake an. Sie konnte nicht im Pfad gefunden werden. - - - The CMake executable (%1) does not exist. - Die ausführbaren Datei von cmake (%1) existiert nicht. - - - The path %1 is not a valid CMake. - Der Pfad %1 ist keine gültige CMake-Installation. - The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running CMake. Some projects require command line arguments to the initial CMake call. Das Verzeichnis %1 enthält keine cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erzeugen. Für einige Projekte sind dazu Kommandozeilenargumente erforderlich. @@ -354,22 +342,34 @@ MinGW Generator (%1) MinGW-Generator (%1) + + No valid cmake executable specified. + Es wurde keine ausführbare cmake-Datei angegeben. + + + CMake exited with errors. Please check CMake output. + CMake wurde mit einem Fehler beendet. Bitte prüfen Sie die Ausgabe von CMake. + NMake Generator (%1) NMake-Generator (%1) + + Please specify the path to the cmake executable. No cmake executable was found in the path. + Bitte geben Sie den Pfad zu der ausführbaren Datei von cmake an. Sie konnte nicht im Pfad gefunden werden. + + + The cmake executable (%1) does not exist. + Die ausführbaren Datei von cmake (%1) existiert nicht. + + + The path %1 is not a valid cmake. + Der Pfad %1 ist keine gültige CMake-Installation. + The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used tool chain here and rerun CMake. Or simply finish the wizard directly. Der Ordner %1 enthält bereits eine hinreichend aktuelle cbp-Datei. Sie können spezielle Argumente angeben oder die Toolchain ändern und cmake noch einmal ausführen. Oder,. beenden Sie den Wizard an dieser Stelle. - - No valid CMake executable specified. - Es wurde keine ausführbare cmake-Datei angegeben. - - - CMake exited with errors. Please check cmake output. - CMake wurde mit einem Fehler beendet. Bitte prüfen Sie die Ausgabe von cmake. - CMakeProjectManager::Internal::CMakeSettingsPage @@ -2645,10 +2645,6 @@ Qt Creator kann sich nicht anhängen. Skip Known Frames Bekannte Stellen überspringen - - Selecting this results in well-known but usually not interesting frames belonging to reference counting and signal emission being skipped while single-stepping. - Bewirkt, dass nicht relevante Aufrufe (wie zum Beispiel zur Referenzzählung und zur Signalübermittlung gehörige Aufrufe) beim Einzelschritt übersprungen werden. - Enable Reverse Debugging Rückwärts Debuggen aktivieren @@ -2696,22 +2692,10 @@ Qt Creator kann sich nicht anhängen. Debugger::Internal::GdbEngine - - The Gdb process crashed some time after starting successfully. - Der Gdb-Prozess ist einige Zeit nach dem Start abgestürzt. - The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again. Zeitüberschreitung bei der letzten waitFor...()-Funktion. Der Status des QProcess ist unverändert, und waitFor...() kann noch einmal gerufen. - - An error occurred when attempting to write to the Gdb process. For example, the process may not be running, or it may have closed its input channel. - Ein Fehler trat beim Versuch des Schreibens zum Gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht, oder hat seinen Eingabekanal geschlossen. - - - An error occurred when attempting to read from the Gdb process. For example, the process may not be running. - Ein Fehler trat beim Versuch des Lesens vom Gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht. - Reading %1... Lese %1... @@ -2740,6 +2724,36 @@ Qt Creator kann sich nicht anhängen. Execution Error Fehler bei der Ausführung + + The gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program. +%2 + Der Start des Gdb-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei '%1' oder die Berechtigungen sind nicht ausreichend. +%2 + + + The gdb process crashed some time after starting successfully. + Der Gdb-Prozess ist einige Zeit nach dem Start abgestürzt. + + + An error occurred when attempting to write to the gdb process. For example, the process may not be running, or it may have closed its input channel. + Ein Fehler trat beim Versuch des Schreibens zum Gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht, oder hat seinen Eingabekanal geschlossen. + + + An error occurred when attempting to read from the gdb process. For example, the process may not be running. + Ein Fehler trat beim Versuch des Lesens vom gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht. + + + An unknown error in the gdb process occurred. + Im gdb-Prozess trat ein unbekannter Fehler auf. + + + GDB not responding + GDB antwortet nicht + + + Give GDB more time + GDB mehr Zeit geben + Cannot continue debugged process: @@ -2798,10 +2812,6 @@ This might yield incorrect results. Version der Ausgabe-Hilfsbibliothek: %1, %n unterstützte Datentypen. - - An unknown error in the Gdb process occurred. - Im Gdb-Prozess trat ein unbekannter Fehler auf. - An exception was triggered. Eine Ausnahme wurde ausgelöst. @@ -2856,14 +2866,6 @@ You can choose between waiting longer or abort debugging. Der Gdb-Prozess hat nach %1 Sekunde nicht auf das Kommando reagiert. Das könnte bedeuten, dass er sich in einer Endlosschleife befinded oder für die Operation mehr Zeit benötigt. Sie haben die Wahl zwischen Abwarten oder Abbrechen. - - Gdb not responding - Gdb antwortet nicht - - - Give gdb more time - Fortsetzen - Stop debugging Debuggen beenden @@ -2936,12 +2938,6 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen. Running requested... Fortsetzung angefordert... - - The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program. -%2 - Der Start des Gdb-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei '%1' oder die Berechtigungen sind nicht ausreichend. -%2 - Raw structure Rohdaten @@ -3016,6 +3012,16 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen. Could not find a widget. Es konnte kein Widget gefunden werden. + + The GDB installed at %1 cannot find a valid python installation in its %2 subdirectory. +You may set the environment variable PYTHONPATH to point to your installation. + Der GDB aus %1 konnte keine Python-Installation in dem Unterverzeichnis %2 finden. +Sie können die Umgebungsvariable PYTHONPATH setzen, um auf die Installation zu verweisen. + + + GDB I/O Error + GDB Ein/Ausgabefehler + The gdb process crashed. Der gdb-Prozess ist abgestürzt. @@ -3024,6 +3030,10 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen. The gdb process exited unexpectedly (code %1) Der Gdb-Prozess wurde plötzlich beendet (%1) + + Unexpected GDB Exit + GDB unerwartet beendet + Failed to start application: Die Anwendung konnte nicht gestartet werden: @@ -3062,20 +3072,6 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen. The gdb location must be given as an absolute path in the debugger settings (%1). Es muss ein absoluter Pfad für die ausführbare gdb-Datei in den Debugger-Einstellungen angegeben werden (%1). - - The gdb installed at %1 cannot find a valid python installation in its %2 subdirectory. -You may set the environment variable PYTHONPATH to point to your installation. - Der gdb aus %1 konnte keine Python-Installation in dem Unterverzeichnis %2 finden. -Sie können die Umgebungsvariable PYTHONPATH setzen, um auf die Installation zu verweisen. - - - Gdb I/O Error - Gdb Ein/Ausgabefehler - - - Unexpected Gdb Exit - Gdb unerwartet beendet - Adapter start failed Der Start des Adapters schlug fehl @@ -3096,8 +3092,8 @@ Sie können die Umgebungsvariable PYTHONPATH setzen, um auf die Installation zu Debugger::Internal::GdbOptionsPage - Gdb - Gdb + GDB + GDB Choose Location of Startup Script File @@ -3697,10 +3693,18 @@ Sie können die Umgebungsvariable PYTHONPATH setzen, um auf die Installation zu Locals and Watchers Lokale Variablen und Überwachte Ausdrücke + + Change Display for Type "%1": + Anzeigeformat für den Typ '%1' ändern: + Automatic Automatisch + + Change Display for Object Named "%1": + Format der Anzeige für das Objekt mit dem Namen "%1" ändern: + Insert New Watch Item Neuen Überwachten Ausdruck einfügen @@ -3753,18 +3757,14 @@ Sie können die Umgebungsvariable PYTHONPATH setzen, um auf die Installation zu Show Unprintable Characters as Hexadecimal Nicht druckbare Zeichen hexadezimal anzeigen - - Change Display for Type "%1" - Anzeigeformat für den Typ '%1' ändern - - - Change Display for Object Named "%1" - Format der Anzeige für das Objekt mit dem Namen "%1" ändern - Use Display Format Based on Type Anzeigeformat per Typ verwenden' + + Change Display for Type or Item... + Anzeigeformat für Typ oder Element ändern... + Add Watchpoint at Object's Address (0x%1) Beim Speicherzugriff auf die Adresse des Objekts (0x%1) anhalten @@ -3809,6 +3809,14 @@ Sie können die Umgebungsvariable PYTHONPATH setzen, um auf die Installation zu Close Editor Tooltips Editor-Tooltips schließen + + Enter watch expression + Überwachten Ausdruck eingeben + + + Expression: + Ausdruck: + Locals & Watchers Lokale Variablen und Überwachte Ausdrücke @@ -4805,14 +4813,6 @@ Add, modify, and remove document filters, which determine the documentation set GdbOptionsPage - - This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up. - Ein Skript mit Kommandos, die unmittelbar nach dem Gdb-Start ausgeführt werden (optional). - - - Gdb startup script: - Gdb-Startskript: - This is the slowest but safest option. Die sicherste Einstellung, zugleich aber auch die langsamste. @@ -4833,10 +4833,6 @@ Add, modify, and remove document filters, which determine the documentation set Never set breakpoints in plugins automatically Haltepunkte in Plugins niemals automatisch setzen - - Gdb timeout: - Gdb-Timeout: - This is the number of seconds Qt Creator will wait before it terminates non-responsive gdb process. The default value of 20 seconds @@ -4845,19 +4841,10 @@ loading big libraries or listing source files takes much longer than that on slow machines. In this case, the value should be increased. Anzahl der Sekunden, die Qt Creator abwartet, bevor gdb-Prozesse abgebrochen werden, die nicht mehr reagieren. Die Vorgabe von 20 Sekunden sollte für die meisten Anwendungsfälle ausreichen, aber es können Situationen auftreten, in denen das Laden großer Bibliotheken oder das Auflisten der Quelldateien viel länger dauert (auf langsamen Maschinen). In diesem Falle sollte der Wert erhöht werden. - - Gdb - Gdb - Enable reverse debugging Rückwärts Debuggen aktivieren - - When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic - reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it. - Diese Option bewirkt, dass 'Einzelschritt in' in bestimmten Situationen mehrere Schritte zusammenfasst, was das Debuggen beschleunigt. Zum Beispiel wird der Code des atomaren Referenzzählung übersprungen; und bei der Emission eines Signals gelangt man zum verbundenen Slot. - Skip known frames when stepping Bekannte Stellen beim Einzelschritt überspringen @@ -4882,6 +4869,42 @@ on slow machines. In this case, the value should be increased. Use asynchronous mode to control the inferior Asynchronen Modus zur Steuerung des zu debuggenden Prozesses verwenden + + When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it. + Diese Option bewirkt, dass 'Einzelschritt in' in bestimmten Situationen mehrere Schritte zusammenfasst, was das Debuggen beschleunigt. Zum Beispiel wird der Code des atomaren Referenzzählung übersprungen; und bei der Emission eines Signals gelangt man direkt zum verbundenen Slot. + + + This will show a message box as soon as your application receives a signal like SIGSEGV during debugging. + Zeigt ein Benachrichtigungsfenster an, wenn die Anwendung während des Debuggens ein Signal wie SIGSEGV erhält. + + + This allows or inhibits reading the user's default .gdbinit file on debugger startup. + Gestattet oder unterdrückt das Lesen der Vorgabe-.gdbinit-Datei des Nutzers beim Starten des Debuggers. + + + GDB + GDB + + + This is either empty or points to a file containing GDB commands that will be executed immediately after GDB starts up. + Ein Skript mit Kommandos, die unmittelbar nach dem GDB-Start ausgeführt werden (optional). + + + GDB startup script: + GDB-Startskript: + + + GDB timeout: + GDB-Timeout: + + + GDB allows setting breakpoints on source lines for which no code was generated. In such situations the breakpoint is shifted to the next source code line for which code was actually generated. This option reflects such temporary change by moving the breakpoint markers in the source code editor. + Nicht alle Quellcode-Zeilen bewirken die Erzeugung von ausführbarem Code. GDB gestattet es dennoch, auf solche Zeilen einen Haltepunkt zu setzen. Dieser wird dann auf die nächste Zeile, für die Code erzeugt wurde, verschoben. Diese Einstellung bewirkt, dass die Haltepunkt-Marke im Quellcode-Editor entsprechend verschoben wird. + + + Enable reverse debugging Selecting this enables reverse debugging. NOTE: This feature is very slow and unstable on the GDB side. It exhibits unpredictable behaviour when going backwards over system calls and is very likely to destroy your debugging session. + Rückwärts-Debuggen aktivieren. Hinweis: Diese Funktionalität ist sehr instabil und langsam auf der GDB-Seite. Es kann unvorhersehbares Verhalten auftreten, wenn man rückwärts über einen Systemaufruf geht, und die Debugger-Sitzung kann leicht zerstört werden. + GeneralSettingsPage @@ -6139,14 +6162,6 @@ rückgängig machen? Bookmarks Lesezeichen - - &Index - &Index - - - &Contents - &Inhalt - Home Startseite @@ -6203,6 +6218,14 @@ rückgängig machen? Next Nächste + + Index + Index + + + Contents + Inhalt + Add Bookmark Lesezeichen hinzufügen @@ -7662,10 +7685,6 @@ Fehler: %2 Save all files before build Alle Dateien vor Erstellen speichern - - Show compiler output on building - Compiler-Ausgabe beim Erstellen anzeigen - Clear old application output on a new run Ausgabe vorangegangener Ausführungen löschen @@ -7695,8 +7714,12 @@ Fehler: %2 Nachfrage beim Stoppen von Anwendungen - Pop up application output pane on running - Ausgabepanel bei der Ausgeführung von Anwendungen zeigen + Open compiler output pane when building + Compiler-Ausgabe beim Erstellen anzeigen + + + Open application output pane when running + Ausgabepanel bei der Ausführung von Anwendungen zeigen @@ -8188,16 +8211,6 @@ konnte dem Projekt '%2' nicht hinzugefügt werden. Title of dialog Neues Projekt - - Failed to open project - Das Projekt konnte nicht geöffnet werden - - - Failed to open project: -%1 - Das Projekt konnte nicht geöffnet werden: -%1 - Cancel Build && Close Erstellen abbrechen und schließen @@ -9135,6 +9148,10 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü %1 build directory Im Ordner %1 existiert ein inkompatibler Build, der überschrieben wird. + + <No tool chain selected> + <Keine Toolchain ausgewählt> + Manage Verwaltung @@ -9444,6 +9461,18 @@ S60 emulator run configuration default display name, %1 is base pro-File nameQt4 MakeStep display name. Make + + Qt Creator needs a tool chain set up to build. Please configure a tool chain in Project mode. + Qt Creator benötigt eine Toolchain zum Erstellen des Projekts. Bitte richten Sie eine Toolchain im Projektmodus ein. + + + Makefile not found. Please check your build settings + Die Makefile-Datei konnte nicht gefunden werden. Bitte überprüfen Sie die Einstellungen zur Erstellung. + + + Configuration is faulty, please check the Build Issues view for details. + Die Konfiguration ist fehlerhaft. Details befinden sich in der Ansicht "Build-Probleme". + Qt4ProjectManager::MakeStepConfigWidget @@ -9528,14 +9557,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameMinGW from %1 MinGW aus %1 - - WINSCW from %1 - WINSCW aus %1 - - - GCCE from %1 - GCCE aus %1 - <not found> <nicht gefunden> @@ -10053,10 +10074,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich &Architecture: &Architektur: - - &GNU target - &GNU-Zielplattform - Sys&root: Sys&root: @@ -10066,8 +10083,12 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich Server-Startskript &benutzen: - Server st&art script: - Server-&Startskript: + &GNU target: + &GNU-Zielplattform: + + + &Server start script: + &Server-Startskript: @@ -11179,6 +11200,10 @@ Die folgenden Encodings scheinen der Datei zu entsprechen: Cannot create temporary file: %1 Es konnte keine temporäre Datei erstellt werden: %1 + + Cannot write temporary file. Disk full? + Es konnte keine temporäre Datei erstellt werden. Möglicherweise ist kein Speicherplatz mehr auf der Festplatte vorhanden? + Unexpected output from helper program (%1). Die Ausgabe des Hilfsprogrammes (%1) kann nicht ausgewertet werden. @@ -11895,9 +11920,9 @@ p, li { white-space: pre-wrap; } Debugger::Internal::AbstractGdbAdapter - The Gdb process could not be stopped: + The gdb process could not be stopped: %1 - Der Gdb-Prozess konnte nicht angehalten werden: + Der gdb-Prozess konnte nicht angehalten werden: %1 @@ -13375,6 +13400,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.%1 is an invalid id %1 ist keine gültige ID + + %1 already exists + %1 existiert bereits + Warning Warnung @@ -13701,10 +13730,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.Debugging type: Debuggen: - - Use remote gdb - gdb-Kommandozeilenprogramm benutzen - Use remote gdbserver Gdb-Server benutzen @@ -13729,10 +13754,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.Choose directory to mount Ordner für mount-Vorgang auswählen - - <b>Debugging details:</b> Use gdb - <b>Debuggereinstellung:</b> Benutze gdb - <b>Debugging details:</b> Use gdbserver <b>Debuggereinstellung:</b> Benutze Gdb-Server @@ -13761,6 +13782,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.No local directories to be mounted on the device. Es existieren keine lokalen Ordner, die auf dem Mobilgerät angehängt werden können (mount). + + Use remote GDB + Entfernten GDB benutzen + + + <b>Debugging details:</b> Use GDB + <b>Debuggereinstellung:</b> Benutze GDB + One local directory to be mounted on the device. Es existiert ein lokaler Ordner, der auf dem Mobilgerät angehängt werden kann (mount). @@ -14288,8 +14317,8 @@ Vorheriger vorzeichenbehafteter Dezimalwert (Big Endian): %4 QmlProjectManager::QmlProject - Error while loading project file! - Fehler beim Laden der Projektdatei! + Error while loading project file %1. + Fehler beim Laden der Projektdatei %1. @@ -14699,8 +14728,12 @@ Haben Sie Qemu gestartet? Die Überprüfung der Qt-Version schlug fehl! Auf dem Gerät muss Qt-Version 4.6.2 oder neuer installiert sein. - Mad Developer is not installed.<br>You will not be able to deploy to this device. - Mad Developer ist nicht installiert.<br>Ein Deployment auf dieses Mobilgerät ist nicht möglich. + %1 is not installed.<br>You will not be able to deploy to this device. + %1 ist nicht installiert.<br>Ein Deployment auf dieses Mobilgerät ist nicht möglich. + + + Please switch the device to developer mode via Settings -> Security. + Bitte schalten sie das Mobilgerät über Einstellungen -> Sicherheit in den Entwicklermodus. Error retrieving list of used ports: %1 @@ -16262,6 +16295,10 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete %1 is an invalid id %1 ist keine gültige ID + + %1 already exists + %1 existiert bereits + emptyPane @@ -16611,29 +16648,6 @@ IDs müssen außerdem mit einem Kleinbuchstaben beginnen. Untergeordnete Projekte anzeigen - - AttachTcfDialog - - Start Debugger - Debugger starten - - - Host and port: - Host und Portnummer: - - - Architecture: - Architektur: - - - Use server start script: - Server-Startskript benutzen: - - - Server start script: - Server-Startskript: - - Help::Internal::RemoteFilterOptions @@ -16816,10 +16830,6 @@ IDs müssen außerdem mit einem Kleinbuchstaben beginnen. <b>Files to install for subproject:</b> <b>Zu installierende Dateien des Unterprojektes:</b> - - <a href=irrelevant>Manage device configurations</a> - <a href=irrelevant>Gerätekonfigurationen verwalten</a> - Edit the project file to add or remove entries. Projektdatei bearbeiten, um Einträge hinzuzufügen oder zu löschen. @@ -16832,6 +16842,10 @@ IDs müssen außerdem mit einem Kleinbuchstaben beginnen. Add Launcher Icon ... Icon für Starter hinzufügen... + + <a href="irrelevant">Manage device configurations</a> + <a href=irrelevant>Gerätekonfigurationen verwalten</a> + QtQuickAppWizardSourcesPage @@ -17210,13 +17224,6 @@ Server: %2. Der Ordner %1 konnte nicht angelegt werden. - - Debugger::Internal::AttachTcfDialog - - Select Executable - Ausführbare Datei auswählen - - Debugger::DebuggerPlugin @@ -17319,12 +17326,12 @@ Das Setzen von Haltepunkten nach Dateinamen und Zeilennummern könnte nicht funk Das Lesen der Ausgabe der Anwendung wurde plötzlich abgebrochen. - Remote gdb failed to start. - Der entfernte gdb-Prozess konnte nicht gestartet werden. + Remote GDB failed to start. + Der entfernte GDB-Prozess konnte nicht gestartet werden. - Remote gdb crashed. - Der entfernte gdb-Prozess ist abgestürzt. + Remote GDB crashed. + Der entfernte GDB-Prozess ist abgestürzt. @@ -17355,21 +17362,6 @@ Das Setzen von Haltepunkten nach Dateinamen und Zeilennummern könnte nicht funk Vollständiger Name - - Debugger::Internal::TcfEngine - - %1. - %1. - - - Running requested... - Fortsetzung angefordert... - - - Stopped. - Angehalten. - - Git::Internal::SettingsPageWidget @@ -19233,36 +19225,32 @@ Sie können diese Anwendung sowohl auf Desktop- als auch auf mobilen Plattformen Funktionsname: - Function "main()" - Funktion "main()" + Break when C++ Exception is Thrown + Halte beim Auftreten einer C++-Ausnahme an - throw - throw + Break when C++ Exception is Caught + Halte beim der Behandlung einer C++-Ausnahme an - catch - catch + Break when Function "main()" Starts + Halte bei Erreichen der Funktion "main()" an - fork - fork + Break when a new Process is Forked + Halte beim Starten eines neuen Prozesses an - exec - exec + Break when a new Process is Executed + Halte beim Beginn der Ausführung eines neuen Prozesses an - vfork - vfork + Break when a System Call is Executed + Halte bei Systemaufruf an - syscall - syscall - - - Address (Watchpoint) - Adresse (Watchpoint) + Break on Data Access (Watchpoint) + Halte bei Datenzugriff an (Watchpoint) Specifying the module (base name of the library or executable) @@ -19274,13 +19262,13 @@ erheblich reduzieren (CDB, LLDB). Debugger command to be executed when the breakpoint is hit. -gdb allows for specifying a sequence of commands separated by the delimiter '\n'. +GDB allows for specifying a sequence of commands separated by the delimiter '\n'. Debugger-Kommando zur Ausführung beim Auslösen des Haltepunkts. -Bei gdb kann eine durch '\n' getrennte Kommandosequenz angegeben werden. +Bei GDB kann eine durch '\n' getrennte Kommandosequenz angegeben werden. - <html><head/><body><p>Determines how the path is specified when setting breakpoints:</p><ul><li><i>Use Engine Default</i>: Preferred setting of the debugger engine.</li><li><i>Use Full Path</i>: Pass full path, avoiding ambiguities should files of the same name exist in several modules. This is the engine default for CDB and LLDB.</li><li><i>Use File Name</i>: Pass the file name only. This is useful when using a source tree whose location does not match the one used when building the modules. It is the engine default for gdb as using full paths can be slow with this engine.</li></ul></body></html> - <html><head/><body><p>Bestimmt, wie der Pfad beim Setzen von Haltepunkten angegeben wird:</p><ul><li><i>Engine-Vorgabe verwenden</i>: Vorgabeeinstellung des Engine.</li><li><i>Vollständigen Pfad verwenden</i>: Der vollständige Pfadname wird übergeben. Dadurch werden Zweideutigkeiten vermieden, wenn in verschiedenenen Modulen Quelldateien gleichen Namens vorkommen. Dies ist die Vorgabeeinstellung bei CDB und LLDB.</li><li><i>Dateinamen verwenden</i>: Es wird lediglich der Dateiname übergeben. Diese Einstellung kann verwendet werden, wenn sich die Quellen in einem anderen Verzeichnisbaum befinden, als es beim Erstellen der Module der Fall war. Es ist die Vorgabeeinstellung beim gdb-Engine, da die Verwendung vollständiger Pfade bei diesem Engine unter Umständen langsam ist.</li></ul></body></html> + <html><head/><body><p>Determines how the path is specified when setting breakpoints:</p><ul><li><i>Use Engine Default</i>: Preferred setting of the debugger engine.</li><li><i>Use Full Path</i>: Pass full path, avoiding ambiguities should files of the same name exist in several modules. This is the engine default for CDB and LLDB.</li><li><i>Use File Name</i>: Pass the file name only. This is useful when using a source tree whose location does not match the one used when building the modules. It is the engine default for GDB as using full paths can be slow with this engine.</li></ul></body></html> + <html><head/><body><p>Bestimmt, wie der Pfad beim Setzen von Haltepunkten angegeben wird:</p><ul><li><i>Engine-Vorgabe verwenden</i>: Vorgabeeinstellung des Engine.</li><li><i>Vollständigen Pfad verwenden</i>: Der vollständige Pfadname wird übergeben. Dadurch werden Zweideutigkeiten vermieden, wenn in verschiedenenen Modulen Quelldateien gleichen Namens vorkommen. Dies ist die Vorgabeeinstellung bei CDB und LLDB.</li><li><i>Dateinamen verwenden</i>: Es wird lediglich der Dateiname übergeben. Diese Einstellung kann verwendet werden, wenn sich die Quellen in einem anderen Verzeichnisbaum befinden, als es beim Erstellen der Module der Fall war. Es ist die Vorgabeeinstellung beim GDB-Engine, da die Verwendung vollständiger Pfade bei diesem Engine unter Umständen langsam ist.</li></ul></body></html> Address @@ -19657,8 +19645,8 @@ Fehler: %2 LLDB aktivieren - Use Gdb python dumpers - Gdb Python Dumper verwenden + Use GDB python dumpers + GDB-Python Dumper verwenden @@ -19759,14 +19747,6 @@ Fehler: %2 Qt4ProjectManager::Internal::DebuggingHelper - - Helps showing content of Qt types. Only used in older versions of gdb. - Hilft bei der Anzeige des Inhalts von Qt-Datentypen. Wird nur von älteren Versionen von gdb benutzt. - - - Gdb Helper: - Gdb-Hilfsbibliothek: - Used to extract QML type information from library-based plugins. Wird zur Bestimmung von QML-Typinformationen für bibliotheksbasierte Plugins benutzt. @@ -19807,6 +19787,14 @@ Fehler: %2 QML Debugging Library: QML-Debugbibliothek: + + Helps showing content of Qt types. Only used in older versions of GDB. + Hilft bei der Anzeige des Inhalts von Qt-Datentypen. Wird nur von älteren Versionen von GDB benutzt. + + + GDB Helper: + GDB-Hilfsbibliothek: + MaemoDeviceConfigurationsSettingsWidget @@ -19964,24 +19952,6 @@ Fehler: %2 WizardPage WizardPage - - To deploy the public key to your device, please execute the following steps: -<ul> -<li>Connect the device to your computer (unless you plan to connect via WLAN).</li> -<li>On the device, start the "Mad Developer" application.</li> -<li>In "Mad Developer", configure the device's IP address to the one shown below (or edit the field below to match the address you have configured).</li> -<li>In "Mad Developer", press "Developer Password" and enter it in the field below.</li> -<li>Click "Deploy Key"</li> - - Um den Schlüssel zum Mobilgerät zu senden, führen Sie bitte die folgenden Schritte aus: -<ul> -<li>Verbinden Sie das Mobilgerät mit dem Computer (sofern kein WLAN verwendet wird).</li> -<li>Starten Sie den Anwendung "Mad Developer" auf dem Mobilgerät.</li> -<li>Stellen Sie die unten angezeigte IP-Adresse in der Anwendung "Mad Developer" ein (oder passen Sie die unten angezeigte Adresse der von Ihnen konfigurierten Adresse an).</li> -<li>Betätigen Sie "Developer Password" in der Anwendung "Mad Developer" und tragen Sie es in das unten gezeigte Feld "Passwort" ein.</li> -<li>Betätigen Sie "Schlüssel senden".</li> - - Device address: Adresse des Geräts: @@ -19994,6 +19964,24 @@ Fehler: %2 Deploy Key Schlüssel senden + + To deploy the public key to your device, please execute the following steps: +<ul> +<li>Connect the device to your computer (unless you plan to connect via WLAN).</li> +<li>On the device, start the "%%%maddev%%%" application.</li> +<li>In "%%%maddev%%%", configure the device's IP address to the one shown below (or edit the field below to match the address you have configured).</li> +<li>In "%%%maddev%%%", press "Developer Password" and enter it in the field below.</li> +<li>Click "Deploy Key"</li> + + Um den Schlüssel zum Mobilgerät zu senden, führen Sie bitte die folgenden Schritte aus: +<ul> +<li>Verbinden Sie das Mobilgerät mit dem Computer (sofern kein WLAN verwendet wird).</li> +<li>Starten Sie den Anwendung "%%%maddev%%%" auf dem Mobilgerät.</li> +<li>Stellen Sie die unten angezeigte IP-Adresse in der Anwendung "%%%maddev%%%" ein (oder passen Sie die unten angezeigte Adresse der von Ihnen konfigurierten Adresse an).</li> +<li>Betätigen Sie "Developer Password" in der Anwendung "%%%maddev%%%" und tragen Sie es in das unten gezeigte Feld "Passwort" ein.</li> +<li>Betätigen Sie "Schlüssel senden".</li> + + MaemoDeviceConfigWizardCheckPreviousKeySetupPage @@ -20347,6 +20335,38 @@ Fehler: %2 Flickable Flickable + + Content Size + Größe des Inhalts + + + Flickable Direction + Richtung der Flickable-Interaktion + + + Bounds Behavior + Verhalten der Begrenzungen + + + Interactive + Interaktiv + + + Max. Velocity + Maximale Geschwindigkeit + + + Maximum Flick Velocity + Maximale Geschwindigkeit der Flick-Interaktion + + + Deceleration + Abbremsung + + + Flick Deceleration + Abbremsung der Flick-Interaktion + QmlJS::TypeDescriptionReader @@ -20706,14 +20726,6 @@ Hinweis: Unter Umständen wird die lokale Datei gelöscht. Attach to Core... Debugge core-Datei - - Attach to Running Tcf Agent... - Verbinde zu Tcf-Agent... - - - This attaches to a running 'Target Communication Framework' agent. - Verbindet zu einem laufenden Agenten, der das 'Target Communication Framework'-Protokoll verwendet. - Start and Attach to Remote Application... An entfernte Anwendung anhängen... @@ -20815,10 +20827,6 @@ Hinweis: Unter Umständen wird die lokale Datei gelöscht. Fatal engine shutdown. Incompatible binary or IPC error. Die Engine wurde wegen einem kritischen Fehler gestoppt (inkompatible ausführbare Datei oder IPC-Fehler). - - Fatal engine shutdown. Incompatible binary or ipc error. - Die Engine wurde wegen einem kritischen Fehler gestoppt (inkompatible ausführbare Datei oder IPC-Fehler). - Debugger::Internal::LldbEngineHost @@ -20972,7 +20980,7 @@ Soll es noch einmal versucht werden? Git::Internal::BaseGitDiffArgumentsWidget - Use the patience algorithmn for calculating the diff + Use the patience algorithm for calculating the diff "patience diff"-Algorithmus verwenden @@ -21544,14 +21552,18 @@ Bitte erstellen Sie die Debugger-Hilfskomponenten auf der Einstellungsseite der Key Creation Schlüssel erzeugen - - You have not entered a writable directory. - Der angegebene Ordner ist nicht schreibbar. - Cannot Create Keys Fehler beim Erzeugen der Schlüssel + + The path you have entered is not a directory. + Der angegebene Pfad ist kein Ordner. + + + The directory you have entered does not exist and cannot be created. + Der angegebene Ordner existiert nicht und kann nicht angelegt werden. + Creating keys ... Erzeuge Schlüssel... @@ -21592,8 +21604,8 @@ Bitte erstellen Sie die Debugger-Hilfskomponenten auf der Einstellungsseite der Schlüssel gesendet - The key was successfully deployed. You may now close the "Mad Developer" application and continue. - Der Schlüssel wurde erfolgreich gesendet. Sie können nun die Anwendung "Mad Developer" schließen und fortfahren. + The key was successfully deployed. You may now close the "%1" application and continue. + Der Schlüssel wurde erfolgreich gesendet. Sie können nun die Anwendung "%1" schließen und fortfahren. Done. @@ -21611,8 +21623,8 @@ Bitte erstellen Sie die Debugger-Hilfskomponenten auf der Einstellungsseite der Die neue Gerätekonfiguration wird nun erstellt und eine Testprozedur ausgeführt, die prüft, ob Qt Creator eine Verbindung zum Gerät herstellen kann und einige Informationen zum Gerät bereitstellt. - Please make sure that Qemu is running, otherwise the test will fail. - Bitte stellen Sie sicher, dass Qemu läuft, da andernfalls der Test fehlschlägt. + The new device configuration will now be created. + Die neue Gerätekonfiguration wird nun erzeugt. @@ -21644,6 +21656,14 @@ Ist das Gerät verbunden und für Netzwerkzugriff eingerichtet? (No device) (Kein Gerät) + + SDK Connectivity + SDK-Verbindungen + + + Mad Developer + Mad Developer + Failed to remove directory '%1'. Der Ordner '%1' konnte nicht gelöscht werden. @@ -21827,16 +21847,16 @@ Ist das Gerät verbunden und für Netzwerkzugriff eingerichtet? Die Desktop-Datei '%1' konnte nicht angepasst werden. - The package description is empty. - Die Beschreibung des Pakets ist leer. + The package description is empty. You must set one in Projects -> Run -> Create Package -> Details. + Die Paketbeschreibung ist leer. Sie muss unter Projekte -> Ausführung -> Paketerzeugung -> Details angegeben werden. - The package description is '%1', which is probably not what you want. - Die Beschreibung des Pakets lautet '%1', was wahrscheinlich nicht beabsichtigt war. + The package description is '%1', which is probably not what you want. Please change it in Projects -> Run -> Create Package -> Details. + Die Paketbeschreibung ist gegenwärtig '%1', was wahrscheinlich nicht beabsichtigt ist. Bitte ändern Sie sie unter Projekte -> Ausführung -> Paketerzeugung -> Details. - You have not set an icon for the package manager. - Sie haben noch kein Icon für die Paketverwaltung gesetzt. + You have not set an icon for the package manager. The icon must be set in Projects -> Run -> Create Package -> Details. + Sie haben kein Icon für die Paketverwaltung angegeben werden. Es muss unter Projekte -> Ausführung -> Paketerzeugung -> Details angegeben werden. @@ -21953,12 +21973,12 @@ Fehlerausgabe: %1 Klicken Sie hier, um den OpenGL-Modus zu ändern. - <p>You have configured Qemu to use OpenGL hardware acceleration, which might not be supported by your system. You could try using software rendering instead. - <p>Sie haben in Qemu OpenGL-Hardwarebeschleunigung eingestellt, was von Ihrem System nicht unterstützt sein könnte. Sie könnten stattdessen Software-Rendering verwenden. + You have configured Qemu to use OpenGL hardware acceleration, which might not be supported by your system. You could try using software rendering instead. + Sie haben in Qemu OpenGL-Hardwarebeschleunigung eingestellt, was von Ihrem System nicht unterstützt sein könnte. Sie könnten stattdessen Software-Rendering verwenden. - <p>Qemu is currently configured to auto-detect the OpenGL mode, which is known to not work in some cases.You might want to use software rendering instead. - <p>Sie haben in Qemu die automatische Bestimmung des OpenGL-Modus eingestellt, was nicht immer funktioniert. Sie könnten stattdessen Software-Rendering verwenden. + Qemu is currently configured to auto-detect the OpenGL mode, which is known to not work in some cases. You might want to use software rendering instead. + Sie haben in Qemu die automatische Bestimmung des OpenGL-Modus eingestellt, was nicht immer funktioniert. Sie könnten stattdessen Software-Rendering verwenden. @@ -22266,7 +22286,7 @@ Verwenden Sie ein Entwicklerzertifikat oder eine andere Form der Signierung, um Bitte beenden Sie die Installation auf dem Mobilgerät. - <html><head/><body><center><i>%1</i> is still running on the device.<center/><center>Terminating it can leave the target in an inconsistent state.</center><center>Would you still like to terminate it?</center></body></html> + <html><head/><body><center><i>%1</i> is still running on the device.</center><center>Terminating it can leave the target in an inconsistent state.</center><center>Would you still like to terminate it?</center></body></html> <html><head/><body><center><i>%1</i> läuft noch auf dem Mobilgerät.<center/><center>Ein Abbruch kann zu einem inkonsistenten Zustand des Gerätes führen.</center><center>Möchten Sie dennoch abbrechen?</center></body></html> @@ -23163,6 +23183,10 @@ Die Einstellung gestattet es, unter diesem Umständen fortzusetzen Remove Löschen + + Clone + Klonen + Qt4ProjectManager::Internal::RvctToolChainConfigWidget @@ -23754,7 +23778,7 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen. CMakeProjectManager::Internal::CMakeManager - Run cmake + Run CMake CMake ausführen @@ -24021,10 +24045,6 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen. Tool Chains Toolchains - - Clone ... - Kopie erstellen... - QmlJSEditor::QmlJSTextEditorWidget @@ -24092,8 +24112,8 @@ Fehler: %2 Qt4ProjectManager::Internal::MaemoToolChainConfigWidget - MADDE Root: %1<br>Target Root: %2 - MADDE Wurzelverzeichnis: %1<br>Wurzelverzeichnis des Ziels: %2 + <html><head/><body><table><tr><td>Path to MADDE:</td><td>%1</td></tr><tr><td>Path to MADDE target:</td><td>%2</td></tr><tr><td>Debugger:</td/><td>%3</td></tr></body></html> + <html><head/><body><table><tr><td>Pfad zu MADDE:</td><td>%1</td></tr><tr><td>Pfad zu MADDE-Ziel:</td><td>%2</td></tr><tr><td>Debugger:</td/><td>%3</td></tr></body></html> @@ -24102,6 +24122,10 @@ Fehler: %2 GCCE GCCE + + GCCE from Qt version + GCCE aus Qt-Version + GCCE (%1) GCCE (%1) @@ -24133,6 +24157,10 @@ Fehler: %2 WINSCW WINSCW + + WINSCW from Qt version + WINSCW aus Qt-Version + Qt4ProjectManager::Qt4DefaultTargetSetupWidget @@ -25010,6 +25038,10 @@ Außerdem wird die Anwendung bei Verwendung einer nicht freigegebenen Qt-Version Invalid Frees Ungültige Verwendung von free + + These suppression files were used in the last memory analyzer run. + Die Ausschlussdateien wurden beim letzten Lauf der Speicheranalyse verwendet. + External Errors Externe Fehler @@ -25022,10 +25054,6 @@ Außerdem wird die Anwendung bei Verwendung einer nicht freigegebenen Qt-Version Suppressions Ausschlüsse - - These suppression files where used in the last memory analyzer run. - Die Ausschlussdateien wurden beim letzten Lauf der Speicheranalyse verwendet. - Internal Error Interner Fehler From 17a5186af43734a56d27c1a9dd2d1c0cb2a721ff Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 1 Apr 2011 18:17:40 +0200 Subject: [PATCH 04/18] Symbian: Make cloning of RVCT toolchain work Make sure to not show PATH and other generated environment variables in the base environment (which ends up in the configuration widget). The generated changes will find their way into the set up changes otherwise when accepting any change to the RVCT toolchain where they will override other changes. Task-number: QTCREATORBUG-4326 Reviewed-by: dt --- src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp index d85d5f4dff1..7c843b67d1f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp @@ -87,7 +87,7 @@ static QString armVersionString(RvctToolChain::ArmVersion av) static Utils::Environment baseEnvironment(RvctToolChain *tc) { Utils::Environment result; - tc->addToEnvironment(result); + result.modify(tc->environmentChanges()); return result; } From add9dd288d8117e081764e0d3c536d524ee19a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Fri, 1 Apr 2011 12:50:57 +0200 Subject: [PATCH 05/18] Fixed value of DisassemblerCapability Was the same as the ReloadModuleCapability. Reviewed-by: Friedemann Kleint --- src/plugins/debugger/cdb/cdbengine.cpp | 1 + src/plugins/debugger/debuggerconstants.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index f8f5c1d3b4e..f0217c4589e 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -1050,6 +1050,7 @@ unsigned CdbEngine::debuggerCapabilities() const { return DisassemblerCapability | RegisterCapability | ShowMemoryCapability |WatchpointCapability|JumpToLineCapability|AddWatcherCapability + |ReloadModuleCapability |BreakOnThrowAndCatchCapability // Sort-of: Can break on throw(). |BreakModuleCapability; } diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index c7ba8834b6d..a125b3a079b 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -162,7 +162,7 @@ enum DebuggerCapabilities ReverseSteppingCapability = 0x1, SnapshotCapability = 0x2, AutoDerefPointersCapability = 0x4, - DisassemblerCapability = 0x80, + DisassemblerCapability = 0x8, RegisterCapability = 0x10, ShowMemoryCapability = 0x20, JumpToLineCapability = 0x40, From 97a411c3df814980ad780107e512364dee285b0c Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 4 Apr 2011 09:59:12 +0200 Subject: [PATCH 06/18] QmlDump: Fix compilation on Linux, Windows Fix regression introduced with 530e7494 : Creator now automatically generates the Info.plist from a Info.plist.in file, but only on Mac OS X. Therefore copying the Info.plist to the temporary folder failed on all other platforms. Reviewed-by: con --- src/plugins/qt4projectmanager/qmldumptool.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/qmldumptool.cpp b/src/plugins/qt4projectmanager/qmldumptool.cpp index 7d83cb26b9b..823141b3eaa 100644 --- a/src/plugins/qt4projectmanager/qmldumptool.cpp +++ b/src/plugins/qt4projectmanager/qmldumptool.cpp @@ -252,8 +252,10 @@ static QStringList sourceFileNames() QStringList files; files << QLatin1String("main.cpp") << QLatin1String("qmldump.pro") << QLatin1String("qmlstreamwriter.cpp") << QLatin1String("qmlstreamwriter.h") - << QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT") - << QLatin1String("Info.plist"); + << QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT"); +#ifdef Q_OS_MAC + files << QLatin1String("Info.plist"); +#endif return files; } From 99ceeadb0f913825f117789b8de2cc5b85ec9d79 Mon Sep 17 00:00:00 2001 From: Pawel Polanski Date: Mon, 4 Apr 2011 11:05:24 +0200 Subject: [PATCH 07/18] Symbian: Application's name is displayed on the "Application Output" tab while debugging Task-number: QTCREATORBUG-4203 Reviewed-by: hjk --- .../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index d31aa3b26c6..4b826542df9 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -463,6 +463,7 @@ static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceR sp.executableUid = rc->executableUid(); sp.serverAddress = activeDeployConf->deviceAddress(); sp.serverPort = activeDeployConf->devicePort().toInt(); + sp.displayName = rc->displayName(); sp.communicationChannel = activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationCodaTcpConnection? Debugger::DebuggerStartParameters::CommunicationChannelTcpIp: From 44ef11ca42cb60fd488c5c77400321bfb49e1281 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 30 Mar 2011 17:09:55 +0200 Subject: [PATCH 08/18] Doc: fix capitalization of GDB and GCC --- doc/qtcreator.qdoc | 84 +++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index a59d7f249b6..d0cdaeb52f4 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -370,7 +370,7 @@ \list - \o GNU Symbolic Debugger (gdb) + \o GNU Symbolic Debugger (GDB) \o Microsoft Console Debugger (CDB) @@ -406,7 +406,7 @@ plugin understands the internal layout of several Qt classes, for example, QString, the Qt containers, and most importantly QObject (and classes derived from it), as well as most containers of the C++ - Standard Library and some gcc and Symbian extensions. This + Standard Library and some GCC and Symbian extensions. This deeper understanding is used to present objects of such classes in a useful way. @@ -4591,9 +4591,9 @@ By default, Qt Creator runs the remote gdbserver daemon on the device for debugging. However, if the sysroot does not match that of the device, you - can run remote gdb, instead. Select the \gui {Run remote gdb} option in + can run remote GDB, instead. Select the \gui {Run remote GDB} option in \gui {Debugging details}. Select the \gui {Set debugger} link to specify - settings for gdb. + settings for GDB. When you run the application on the \gui{Maemo} target, Qt Creator generates a Debian installation package in the build directory by default. You can deliver @@ -7042,7 +7042,7 @@ Qt Creator provides a debugger plugin that acts as an interface between the Qt Creator core and external native debuggers - such as the GNU Symbolic Debugger (gdb), the Microsoft Console Debugger (CDB), + such as the GNU Symbolic Debugger (GDB), the Microsoft Console Debugger (CDB), and a QML/JavaScript debugger. The following sections describe debugging with Qt Creator: @@ -7203,7 +7203,7 @@ Typically, the interaction between Qt Creator and the native debugger is set up automatically and you do not need to do anything. However, you might have an - unsupported gdb version installed, your Linux environment might not have gdb + unsupported GDB version installed, your Linux environment might not have GDB installed at all, or you might want to use the debugging tools for Windows. \note To use the debugging tools for Windows, you must install them and add the @@ -7216,7 +7216,7 @@ \section1 Supported Native Debugger Versions - The debugger plugin supports different builds of the gdb debugger, both + The debugger plugin supports different builds of the GDB debugger, both with and without the ability to use Python scripting. The Python enabled versions are preferred, but they are not available on Mac and on older versions of Linux. @@ -7229,7 +7229,7 @@ The Python version uses a script version of the debugging helpers that does not need any special setup. - The CDB native debugger has similar funtionality to the non-Python gdb debugger + The CDB native debugger has similar funtionality to the non-Python GDB debugger engine. Specifically, it also uses compiled C++ code for the debugging helper library. @@ -7244,26 +7244,26 @@ \o Debugger Modes \row \o Linux - \o gcc - \o gdb + \o GCC + \o GDB \o Yes \o Plain, Terminal, Attach, Remote, Core \row \o Unix - \o gcc - \o gdb + \o GCC + \o GDB \o Yes \o Plain, Terminal, Attach, Remote, Core \row \o Mac OS - \o gcc - \o gdb + \o GCC + \o GDB \o No \o Plain, Terminal, Attach, Core \row \o Windows/MinGW - \o gcc - \o gdb + \o GCC + \o GDB \o Yes \o Plain, Terminal, Attach, Remote, Core \row @@ -7274,14 +7274,14 @@ \o Plain, Terminal, Attach, Post-Mortem \row \o Symbian - \o gcc - \o gdb + \o GCC + \o GDB \o Yes \o On-device \row \o Maemo - \o gcc - \o gdb + \o GCC + \o GDB \o Yes \o On-device \endtable @@ -7294,9 +7294,9 @@ [Advanced Topic] - The gdb native debugger used internally by the debugger plugin runs in + The GDB native debugger used internally by the debugger plugin runs in different adapter modes to cope with the variety - of supported platforms and environments. All gdb adapters inherit from + of supported platforms and environments. All GDB adapters inherit from AbstractGdbAdapter: \list @@ -7314,8 +7314,8 @@ \o RemoteGdbAdapter interacts with the gdbserver running on Linux. - \o CodaGdbAdapter interacts with Symbian devices. The gdb protocol and - the gdb serial protocol are used between gdb and the adapter. The + \o CodaGdbAdapter interacts with Symbian devices. The GDB protocol and + the GDB serial protocol are used between GDB and the adapter. The target communication framework (TCF) protocol is used between the adapter and the CODA debugging agent running on the device. @@ -7339,10 +7339,10 @@ \o Notes \row \o Gdb - \o On Linux and Windows, use the Python-enabled gdb versions that + \o On Linux and Windows, use the Python-enabled GDB versions that are installed when you install Qt Creator and Qt SDK. On Mac OS X, - use the gdb provided with Xcode. - For a custom target, you can build your own Python-enabled gdb. + use the GDB provided with Xcode. + For a custom target, you can build your own Python-enabled GDB. Follow the instructions on \l{http://developer.qt.nokia.com/wiki/QtCreatorBuildGdb}{Building Gdb}. You must use at least Python version 2.5, but we recommend that you @@ -7626,7 +7626,7 @@ causing the \gui{Locals and Watchers} view to show unexpected data. \row - \i The debug information provided by gcc does not include enough + \i The debug information provided by GCC does not include enough information about the time when a variable is initialized. Therefore, Qt Creator can not tell whether the contents of a local variable contains "real data", or "initial noise". If a @@ -7679,7 +7679,7 @@ \note Usually, you do not need this feature, because Qt Creator provides you with better ways to handle the task. For example, instead of using the - gdb \c print command from the command line, you can create a watcher item + GDB \c print command from the command line, you can create a watcher item in the \gui{Locals and Watchers} view and examine the expression there. \section1 Debugging C++ Based Applications @@ -7902,7 +7902,7 @@ \section1 Debugging Helpers Based on Python - Qt Creator uses gdb builds that enable Python scripting to display + Qt Creator uses GDB builds that enable Python scripting to display information in the \gui {Locals and Watchers} view. When Python scripting is used, code (Debugging helpers) does not need to be injected into the debugged process to nicely display QStringList or \c std::map contents, for @@ -7917,14 +7917,14 @@ \list - \o There is no Python-enabled gdb for Mac OS. Mac OS continues + \o There is no Python-enabled GDB for Mac OS. Mac OS continues injection with C++ based debugging helpers. \o On the Symbian platform, an on-device debugging agent restricts the - communication between gdb and the device. Therefore, extracting + communication between GDB and the device. Therefore, extracting QObject properties, for example, is not possible. - \o There is no gdb to communicate with MSVC compiled applications on + \o There is no GDB to communicate with MSVC compiled applications on Windows. So information can be displayed nicely only in a limited fashion by using a cdb extension DLL. @@ -7932,7 +7932,7 @@ \section2 Extending the Python Based Debugging Helpers - On platforms featuring a Python-enabled version of the gdb debugger, + On platforms featuring a Python-enabled version of the GDB debugger, the data extraction is done by a Python script. This is more robust as the script execution is separated from the debugged process. It is also easier to extend as the script is less dependent on the @@ -7940,7 +7940,7 @@ To extend the shipped Python based debugging helpers for custom types, define one Python function per user defined type in the - gdb startup file. By default, the following startup file is used: + GDB startup file. By default, the following startup file is used: \c{~/.gdbinit}. To use another file, select \gui {Tools > Options... > Gdb} and specify a filename in the \gui {Gdb startup script} field. @@ -8148,7 +8148,7 @@ raise an exception. \o \gui{putCallItem(self, name, item, func)} - - Uses gdb to call the function \c func on the value specified by + Uses GDB to call the function \c func on the value specified by \a {item.value} and output the resulting item. This function is not available when debugging core dumps and it is not available on the Symbian platform due to restrictions imposed by the on-device @@ -11077,7 +11077,7 @@ \row \o -disable-gdb - \o Debugger plugin: disable the GNU Symbolic Debugger (gdb) engine. + \o Debugger plugin: disable the GNU Symbolic Debugger (GDB) engine. \row \o -disable-sdb @@ -11230,18 +11230,18 @@ \section1 Built-in Debugger Is Slow During Startup and Runtime - The Qt Creator for Windows installation packages install gdb from MinGW. - Unfortunately, gdb is quite slow on Windows. Qt Creator does not cause - this, as it interacts with gdb and adds custom dumpers for Qt types. + The Qt Creator for Windows installation packages install GDB from MinGW. + Unfortunately, GDB is quite slow on Windows. Qt Creator does not cause + this, as it interacts with GDB and adds custom dumpers for Qt types. \note You can use Qt Creator with MSVC on Windows for debugging. \section1 Debugger Displays Message The message is created by the debugging helpers. Qt Creator posts an - expression to the gdb command line to invoke the debugging helpers. + expression to the GDB command line to invoke the debugging helpers. The expression includes the address of the object to examine. This - address might be modified by gdb before the helper function is called. It + address might be modified by GDB before the helper function is called. It is unclear why and when this happens, but if it happens, the debugging helpers operate on wrong data and come to wrong conclusions. Most likely, they find garbage and declare the variable to be . From 4c41bfc76d5b872d1f958f5bbb0e46ed2fa4eeb7 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 31 Mar 2011 09:24:26 +0200 Subject: [PATCH 09/18] Doc: edit change file Reviewed-by: hjk --- dist/changes-2.2.0 | 213 +++++++++++++++++++++++---------------------- 1 file changed, 107 insertions(+), 106 deletions(-) diff --git a/dist/changes-2.2.0 b/dist/changes-2.2.0 index bd551b9ff0a..b50191d2a29 100644 --- a/dist/changes-2.2.0 +++ b/dist/changes-2.2.0 @@ -1,145 +1,157 @@ -The QtCreator 2.2 release contains bug fixes and new features. +Qt Creator version 2.2 contains bug fixes and new features. -Below is a list of relevant changes. You can find a complete list of changes -within the logs of Qt Creator sources. Simply check it out from the public git -repository. For example: +The most important changes are listed in this document. For a complete +list of changes, see the Git log for the Qt Creator sources that +you can check out from the public Git repository. For example: git clone git://gitorious.org/qt-creator/qt-creator.git git log --cherry-pick --pretty=oneline origin/2.1...origin/2.2 General - * Added support for running user defined external tools (Tools->External) - * Moved toolchain definitions out of Qt versions. - * You can now define toolchains in Tools->Options->ToolChains - * Creator now supports more than one instance of each kind of toolchain - * Support for MIME type customization through editing of patterns and - magic matchers. + * Add support for running user defined external tools (Tools > External) + * Move tool chain definitions out of Qt versions: + * You can now define tool chains in Tools > Options > Tool Chains + * Qt Creator now supports more than one instance of a tool chain + * Add support for customizing MIME types by editing patterns and + magic headers + * Integrate the memcheck tool from Valgrind for Linux and Mac OS X + * Create the infrastructure to set up "soft dependencies" between plugins + * Add the qtpromaker tool that has the same functionality as + "qmake -project", but is much faster. It provides a way to easily set up + dummy .pro files that you need to quickly inspect and navigate "alien" + codebases with Qt Creator + * Document Qt Creator coding style Editing - * Add new Inkpot color scheme - * Moved 'Open in External Editor' to Tools->External->Text + * Add an Inkpot color scheme * Add UTF-8 BOM support - * GLSL Support with: - - syntax checking - - highlighting - - code completion - * Add 'expand/collapse all' context menu entry to Outline pane - * Support for user defined macros was contributed by Nicolas Arnaud-Cormos - * Snippet editor with syntax highlighting, indentation, and basic auto - completion for C++ and QML. + * Move the Open in External Editor item to Tools > External > Text + * Add the Expand/Collapse All context menu item to the Outline pane + * Add support for user-defined macros (contributed by Nicolas Arnaud-Cormos) + * Add a snippet editor with syntax highlighting, indentation, and basic + auto-completion for C++ and QML + * Add GLSL support with: + - Syntax checking + - Highlighting + - Code completion + * Binary editor: + - Visualize data differences after updates + - Fix selection if cursor is left of anchor + - Allow copying also if selection is "backwards" + - Do not draw blinking cursor when there is a selection + FakeVim: + - Implement Ctrl-N/Ctrl-P + - Implement 's' in visual block mode + - Fix Alt-Gr handling on Windows + - Handle more Ctrl-W + commands -Project Support - * QMake project support should be more robust against syntax errors - * Treatment of command line arguments of processes started from build - and run configurations underwent heavy modifications: - - argument lists use native shell syntax; this affects quoting and +Managing Projects + * Improve the robustness of qmake project support against syntax errors + * Change the handling of command line arguments of processes that are + started from build and run configurations: + - Argument lists use native shell syntax; this affects quoting and environment variable expansion most - - the SOURCEDIR and BUILDDIR environment variables were replaced - with %{sourceDir} and %{buildDir} macros - - this affects working directories and executable paths as well - * CMake: Add Ui completion, changes in .ui files are picked up without - a rebuild. - * Syntax highlighting and completion for QMake project files - * Text editor behavior settings now avaiable on a per-project basis. + - The SOURCEDIR and BUILDDIR environment variables were replaced + with %{sourceDir} and %{buildDir} variables + - This affects working directories and executable paths as well + * Support syntax highlighting and completion for qmake project files + * CMake: Add UI completion, changes in .ui files are picked up without + a rebuild + * Specify text editor behavior settings per project + * New project and file wizards: + - Support new keywords %MONTH% and %DAY% for C++ template file + - Add wizards for creating OpenGL fragment and vertex shaders + - Add a wizard for creating HTML5 based applications + - Add a wizard for creating JavaScript files, QTCREATORBUG-3070 Debugging - * Rewrote debugging engine using the Microsoft Console Debugger (CDB) + * Rewrite debugging engine using the Microsoft Console Debugger (CDB) for debugging executables built with Microsoft Visual Studio, resulting in significant speed-up and better display of data - types, supporting both 32bit and 64bit versions of the + types, supporting both 32-bit and 64-bit versions of the Debugging Tools for Windows - * Made it possible to pin debugger tooltips. - * Reworked global architecture to allow multiple debugging sessions (for - different projects, combined Qml/C++ debugging, project 'snapshots', ...) - * Reworked breakpoint handling: new special breakpoint types for "break - on throw", "break on main", data breakpoints - * Introduce combined c++/qml debugging (combined stack, cross-step) (gdb only) + * Make it possible to pin debugger tooltips + * Rework global architecture to allow multiple debugging sessions (for + different projects, combined QML/C++ debugging, project snapshots, + and so on) + * Rework breakpoint handling: add special breakpoint types for break + on throw and break on main, as well as data breakpoints + * Introduce combined QML/C++ debugging (combined stack, cross-step) (GDB only) * Rework per-type and per-item selection of display formats - * New dumpers for QTextCursor, QTextDocument, __m128, QScriptValue - QBasicAtomicPointer, bit fields, boost::shared_ptr (gdb only) + * Add dumpers for QTextCursor, QTextDocument, __m128, QScriptValue + QBasicAtomicPointer, bit fields, boost::shared_ptr (GDB only) * Improve dumpers for QRegion, QVariant (custom types), QSharedPointer, QMultiMap (QTCREATORBUG-3122), QObject, QWeakPointer * Make alphabetic structure member sorting optional * Make dumpers robust in case of missing debug information - * Improve python dumper profiling support + * Improve Python dumper profiling support * Improve stepping performance * Enable breakpoint setting from a disassembler view, QTCREATORBUG-3667 - * Fix display of shadowed variables. + * Fix display of shadowed variables * Fix display of data containing quote characters, QTCREATORBUG-3084 - * Fix display of C style 'typedef struct X { ... } X; + * Fix display of C-style typedef struct X { ... } X; * Fix stack/break view updates after manual module loading, QTCREATORBUG-3427 - * Fix 'Jump To/Run to' when in instruction-wise mode - * Several fixed to the "watcher" handling + * Fix Jump To/Run To when in instruction-wise mode + * Fix the watcher handling * Allow re-running debugger engines, QTCREATORBUG-3073 * Robust process control after -exec-interrupt errors, QTCREATORBUG-2850 * Robust detection of Qt-in-namespace builds * Handle "live updates" in the memory view - * Make memory view writable (gdb only) + * Make memory view writable (GDB only) * Improve starting debugger session directly from the command line - * Improve debugging helpers dialog - -BinEditor: - * Visualize data differences after updates - * Fix selection if cursor is left of anchor - * Allow copying also if selection is "backwards" - * Do not draw blinking cursor when there is a selection + * Improve Debugging Helpers dialog -Help +Debugging QML/JS + * Compile qmljsdebugger code as static library, and link it according to the + setting in the qmake step (replaces QMLJSDEBUGGER_PATH / QMLJSDEBUGGER define) + * Qt Quick Application: Allow debugging also in release builds, improve error + diagnostics + * GUI cosmetics in JS debugger: Show stack frame level, only valid + line numbers in stack view, do not show function code, show dummy + child entry for empty arrays + * Added QML tooltips for property inspection at debug time + * Extend QML Observer for inspection and tweaking of item properties + * Add navigation of the object tree in the QML Observer through a crumble path + * Add the Show Application on Top option + * Move the toolbar from the Observer tab to the main toolbar + * Support setting of breakpoints in .qml files embedded as qrc resources + * Improve linking of QML errors in Application Output pane C++ Support - * Add QuickFix for implementing setters/getters for a Q_PROPERTY - * Add documentation about QuickFixes + * Add a refactoring action for implementing setters and getters for + a Q_PROPERTY + * Add documentation for refactoring actions * Fix switch statement indentation for GNU and Whitesmiths style, QTCREATORBUG-2994 * Fix indentation of labels - * Highlighting for virtual functions - * Navigate to correct overloaded function/method + * Support highlighting for virtual functions + * Navigate to correct overloaded function or method QML/JS Support - * Add wizard for creating JavaScript files, QTCREATORBUG-3070 - * Add local-file completion for url properties, QTCREATORBUG-2619 - * Add warning about invalid files in url properties + * Add local-file completion for URL properties, QTCREATORBUG-2619 + * Add warning about invalid files in URL properties * Add file name completion in imports, QTCREATORBUG-3067 * Add a locator filter for JS functions, QTCREATORBUG-2607 * Add JSlint-style warnings about common JS pitfalls, QTCREATORBUG-3071 * Add completion for attached properties like Component.onCompleted - * Allow QML modules to ship predumped type description files. + * Allow QML modules to ship predumped type description files * Reenable instantiating component scope detection, QTCREATORBUG-2835 * Improve error reporting of failed plugin dumps * Complete a trailing '{' for 'A on b' object bindings, QTCREATORBUG-2642 * Highlight capitalized types, QTCREATORBUG-2658 - * Re-dump a plugin if the shared library/dll changes, QTCREATORBUG-3047 + * Re-dump a plugin if the shared library/DLL changes, QTCREATORBUG-3047 * Build qmldump in debug and release version on Windows, QTCREATORBUG-3549 * Change qmldump to output QML instead of XML * Fix automatic '.' import to also pick up QML modules, QTCREATORBUG-3768 * Fix code model update when files are renamed, QTCREATORBUG-2986 - * Fix incorrect completion when brace is on separate line, QTCREATORBUG-2658 + * Fix incorrect completion when brace is on a separate line, QTCREATORBUG-2658 * Fix quote autoinsertion in string literals, QTCREATORBUG-2155, QTCREATORBUG-3244 * Fix '{' not being an electric character, QTCREATORBUG-3405 * Fix indentation of 'foo: Namesp.Type {', QTCREATORBUG-3371 * .qmlproject format: Allow specifying the 'mainFile' qml file, bump version to 1.1 * Qt Quick UI project: allow user to change run environment - -QML/JS Debugging: - * Compile qmljsdebugger code as static library, and link it based on checkbox in qmake step - (replaces QMLJSDEBUGGER_PATH / QMLJSDEBUGGER define) - * Qt Quick Application: Allow debugging also in release builds, improve error diagnostics - * Gui cosmetics in JS debugger: Show stack frame level, only valid - line numbers in stack view, do not show function code, show dummy - child entry for empty arrays - * Added qml tooltips for property inspection at debug time - * Extended QML Observer for inspection and tweaking of item's properties - * Added navigation of the object tree in the QML Observer through a crumble path - * Add 'show app on top' option - * Move toolbar from Observer tab to the main toolbar space - * Support setting of breakpoints in .qml files embedded as qrc resources - * Improve 'linkification' of QML errors in Application Output pane -FakeVim: - * Implement Ctrl-N/Ctrl-P - * Implement 's' in visual block mode - * Fix Alt-Gr handling on Windows - * Handle more Ctrl-W + commands +Help Platform Specific @@ -150,34 +162,23 @@ Linux (GNOME and KDE) Windows Symbian Target - * Added support for the new on-device debugging agent (CODA) + * Add support for the new on-device debugging agent (CODA) Maemo Target - * Added Meego support. - * Added a device configuration wizard. - * Added a publishing wizard for Fremantle/extras-devel. - * On-demand creation of Desktop files. - * For Fremantle, it's possible to disable packaging again. + * Add MeeGo support + * Add a wizard for configuring connections to Maemo and MeeGo devices + * Add a wizard for publishing applications to Fremantle/extras-devel + * Create desktop files on demand + * Allow disabling packaging for Fremantle -Designer +Qt Designer Version control plugins - * Bazaar support was contributed by Hugues Delorme - -Wizards - * Support new keywords %MONTH% and %DAY% for C++ template file - -Misc - * MemCheck (from Valgrind) integration (Linux, Mac) - * Create infrastructure to setup "soft dependencies" between plugins - * Add a little tool 'qtpromaker' doing the job of 'qmake -project', but - much faster to make Qt Creator usable to quickly inspect and navigate - "alien" codebases a way to easily set up dummy .pro files is needed - * Start documenting Qt Creator's coding style guidelines + * Support Bazaar (contributed by Hugues Delorme) Additional credits go to: * The Inkpot color scheme was based on the Vim color scheme by Ciaran McCreesh, adapted for Qt Creator by Jan Kundrát and subsequently updated by Campbell Barton - * Hugues Delorme for the bazaar plugin which he continues to improve + * Hugues Delorme for the Bazaar plugin which he continues to improve * Nicolas Arnaud-Cormos for the Macro plugin From 5d35a2d416651fae7009005413c73acb0e31d228 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 31 Mar 2011 11:18:15 +0200 Subject: [PATCH 10/18] Doc: add troubleshooting info Reviewed-by: hjk --- doc/qtcreator.qdoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index d0cdaeb52f4..7c0ede3cc05 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -11208,6 +11208,9 @@ \o Make sure you use at least Qt Creator 2.1. + \o Make sure the debugger is set up properly. For more information, + see \l{Setting Up Debugger}. + \o In the \gui Debug mode, select \gui {Windows > Views > Debugger Log} to open the \gui {Debugger Log} view. Browse the contents of the pane on the right hand side to find out what went wrong. From 6bd5636bf5811929ec7f21492ea39a0c93c114f2 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 31 Mar 2011 11:18:41 +0200 Subject: [PATCH 11/18] Doc: fix field name --- doc/qtcreator.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 7c0ede3cc05..c6e5eb68da5 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -4591,7 +4591,7 @@ By default, Qt Creator runs the remote gdbserver daemon on the device for debugging. However, if the sysroot does not match that of the device, you - can run remote GDB, instead. Select the \gui {Run remote GDB} option in + can run remote GDB, instead. Select the \gui {Use remote GDB} option in \gui {Debugging details}. Select the \gui {Set debugger} link to specify settings for GDB. From 9891105464abb48c2bf4db56888068ef7769a3ac Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 31 Mar 2011 11:43:15 +0200 Subject: [PATCH 12/18] UI text: fix capitalization Reviewed-by: hjk --- src/plugins/debugger/gdb/gdboptionspage.ui | 7 ++++--- src/plugins/debugger/lldb/lldboptionspagewidget.ui | 2 +- .../qt-maemo/maemorunconfigurationwidget.cpp | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui index 253461fb511..704c95ba573 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.ui +++ b/src/plugins/debugger/gdb/gdboptionspage.ui @@ -60,7 +60,7 @@ on slow machines. In this case, the value should be increased. This is the number of seconds Qt Creator will wait before -it terminates non-responsive gdb process. The default value of 20 seconds +it terminates non-responsive GDB process. The default value of 20 seconds should be sufficient for most applications, but there are situations when loading big libraries or listing source files takes much longer than that on slow machines. In this case, the value should be increased. @@ -85,7 +85,8 @@ on slow machines. In this case, the value should be increased. - When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it. + Allows 'Step Into' to compress several steps into one step for less noisy debugging. For example, the atomic reference + counting code is skipped, and a single 'Step Into' for a signal emission ends up directly in the slot connected to it. Skip known frames when stepping @@ -154,7 +155,7 @@ on slow machines. In this case, the value should be increased. This is the slowest but safest option. - Try to set breakpoints in plugins always automatically. + Try to set breakpoints in plugins always automatically diff --git a/src/plugins/debugger/lldb/lldboptionspagewidget.ui b/src/plugins/debugger/lldb/lldboptionspagewidget.ui index 9dc9b535045..d9db166c90f 100644 --- a/src/plugins/debugger/lldb/lldboptionspagewidget.ui +++ b/src/plugins/debugger/lldb/lldboptionspagewidget.ui @@ -29,7 +29,7 @@ - Use GDB python dumpers + Use GDB Python dumpers false diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp index ed56e651e3b..3a5fed6af47 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp @@ -194,7 +194,7 @@ void MaemoRunConfigurationWidget::addDebuggingWidgets(QVBoxLayout *mainLayout) QHBoxLayout *debugRadioButtonsLayout = new QHBoxLayout; debugLayout->addRow(debugRadioButtonsLayout); QRadioButton *gdbButton = new QRadioButton(tr("Use remote GDB")); - QRadioButton *gdbServerButton = new QRadioButton(tr("Use remote gdbserver")); + QRadioButton *gdbServerButton = new QRadioButton(tr("Use remote GDB server")); debugRadioButtonsLayout->addWidget(gdbButton); debugRadioButtonsLayout->addWidget(gdbServerButton); debugRadioButtonsLayout->addStretch(1); @@ -429,7 +429,7 @@ void MaemoRunConfigurationWidget::handleDebuggingTypeChanged(bool useGdb) m_runConfiguration->setUseRemoteGdb(useGdb); const QString detailsText = useGdb ? tr("Debugging details: Use GDB") : - tr("Debugging details: Use gdbserver"); + tr("Debugging details: Use GDB server"); m_debugDetailsContainer->setSummaryText(detailsText); } From f270578cb163c7690a4274289d0eb5ec7bfb5744 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 4 Apr 2011 11:28:44 +0200 Subject: [PATCH 13/18] Doc: added FAQ --- doc/config/qtcreator-project.qdocconf | 2 +- doc/qtcreator-faq.qdoc | 249 ++++++++++++++++++++++++++ doc/qtcreator.qdoc | 3 +- 3 files changed, 252 insertions(+), 2 deletions(-) create mode 100644 doc/qtcreator-faq.qdoc diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf index ea4b9edc3e4..9e9d8c18240 100644 --- a/doc/config/qtcreator-project.qdocconf +++ b/doc/config/qtcreator-project.qdocconf @@ -13,7 +13,7 @@ include(macros.qdocconf) include(qt-cpp-ignore.qdocconf) include(qt-defines.qdocconf) -sources.fileextensions = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressbook-sdk.qdoc" +sources.fileextensions = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressbook-sdk.qdoc qtcreator-faq.qdoc" qhp.projects = QtCreator diff --git a/doc/qtcreator-faq.qdoc b/doc/qtcreator-faq.qdoc new file mode 100644 index 00000000000..77a1aa4dec1 --- /dev/null +++ b/doc/qtcreator-faq.qdoc @@ -0,0 +1,249 @@ +/*! + \contentspage index.html + \previouspage creator-os-supported-platforms.html + \page creator-faq.html + \nextpage creator-getting-started.html + + \title FAQ + + This section contains answers to some frequently asked questions about Qt + Creator. You might also find answers to your questions in the + \l{Known Issues} and \l{Tips and Tricks} sections, or the Troubleshooting + sections for a special area, such as + \l{Troubleshooting Debugger}{debugging}. + + \section1 General Questions + + \bold {How do I reset all Qt Creator settings?} + + Qt Creator creates two files and a directory: + + \list + + \o QtCreator.db + + \o QtCreator.ini + + \o qtcreator + + \endlist + + The location depends on the platform. On Linux, Unix, and Mac OS, the files + are located in \c{~/.config/Nokia}. + + On Windows XP, the files are located in + \c{:\Documents and Settings\\Application Data\Nokia}, and + on Windows Vista and Windows 7 in + \c {:\Users\\AppData\Roaming\Nokia}. + For all versions, try the path \c{APPDATA\Nokia}. + + \bold {Qt Creator comes with MinGW, should I use this version with Qt?} + + Use the version that was built against the Qt version. + + \bold {Qt Creator does not find a helper application, such as Git or a + compiler. What should I do?} + + Make sure that the application is in your system PATH when starting Qt + Creator. Also select \gui {Tools > Options} to check the settings specified + for the application. Many plugins specify either the path to the tool they + need or the environment they run in. + + This is especially relevant for the Mac OS where \c {/usr/local/bin} might + not be in the path when Qt Creator is started. + + \bold {How do I change the interface language for Qt Creator?} + + Qt Creator has been localized into several languages. If the system + language is one of the supported languages, it is automatically selected. + To change the language, select \gui {Tools > Options > Environment} and + select a language in the \gui Language field. The change takes effect after + you restart Qt Creator. + + \bold {Has a reported issue been addressed?} + + You can look up any issue in the + \l{http://bugreports.qt.nokia.com/}{Qt bug tracker}. + + \section1 Qt Designer Integration Questions + + \bold {Why are custom widgets not loaded in Design mode even though it + works in standalone Qt Designer?} + + Qt Designer fetches plugins from standard locations and loads the plugins + that match its build key. The locations are different for standalone and + integrated Qt Designer. + + For more information, see \l{Adding Qt Designer Plugins}. + + \section1 Help Questions + + \bold {The Qt API Reference Documentation is missing and context help does + not find topics. What can I do?} + + Qt Creator comes fully integrated with Qt documentation and examples using + the Qt Help plugin. The integrated Qt Reference Documentation is available + for Qt 4.4 and later. Qt Creator, \QSDK, and other Qt deliverables contain + documentation as .qch files. All the documentation is accessible in the + \gui Help mode. + + To view the documentation that is available and to add documentation, + select \gui {Tools > Options... > Help > Documentation}. For more + information, see \l{Adding External Documentation}. + + \section1 Debugger Questions + + For information on troubleshooting debugger, see + \l{Troubleshooting Debugger}. + + \bold {If I have a choice of GDB versions, which should I use?} + + On Linux and Windows, use the Python-enabled GDB versions that are + installed when you install Qt Creator and Qt SDK. On Mac OS X, use the GDB + provided with Xcode. For a custom target, you can build your own + Python-enabled GDB. Follow the instructions in + \l{http://developer.qt.nokia.com/wiki/QtCreatorBuildGdb}{Building GDB}. + + You must use at least Python version 2.5, but we recommend that you use + version 2.6. + + For more information on setting up debugger, see \l{Setting Up Debugger}. + + \section1 Code Editor Questions + + \bold {How can I get code-completion to work on the standard headers and + phonon?} + + Install a build from March 31, 2009, or later. + + \section1 Compiler Questions + + \bold {How can I make use of my multi-core CPU with Qt Creator?} + + On Linux and Mac OS X, go to \gui Project mode, select your configuration + in the \gui {Build Settings}, locate the \gui {Build Steps}, and add the + following value, where \c{} is the amount of cores in your CPU: + \c{-j } + + On Windows, nmake does not support the \c{-j} parameter. Instead, we + provide a drop-in replacement called jom. You can download a precompiled + version of jom from \l{ftp://ftp.qt.nokia.com/jom/}{Qt FTP server}. + Put jom.exe in a location in the %PATH%. Go to the \gui {Build Settings} + and set jom.exe as the make command. + + \note: Unlike GNU make, jom automatically detects your cores and spawns as + many parallel processes as your CPU has cores. You can override this + behavior by using the \c{-j} parameter as described above. + + \section1 Qt SDK Questions + + \bold {I cannot use QSslSocket with the SDK. What should I do?} + + The Qt build in the SDK is built with QT_NO_OPENSSL defined. Rebuilding it + is possible. For more information, see + \l{http://www.qtcentre.org/forum/f-qt-programming-2/t-qssl-19222-post94842.html}. + + \bold {Which development packages from the distribution are needed on + Ubuntu or Debian?} + + \code + @ + sudo apt-get install libglib2.0-dev libSM-dev libxrender-dev libfontconfig1-dev libxext-dev + @ + \endcode + + If you use QtOpenGL, you also need: + + \code + @ + sudo apt-get install libgl-dev libglu-dev + @ + \endcode + + \section1 Platform Releated Questions + + \bold {Can I develop Qt for Symbian applications with Qt Creator?} + + Qt Creator comes with support for developing Qt applications that target + the Symbian platform. For more information, see + \l{Creating a Mobile Application with Qt SDK}. + + \section1 Questions about New Features + + \bold {Will a requested feature be implemented?} + + If it is a scheduled feature, you can see this in the task tracker. If a + feature already has been implemented, it is mentioned in the + \l{http://qt.gitorious.org/qt-creator/qt-creator/trees/master/dist}{changes file} + for the upcoming release. + + \bold {Why does Qt Creator not use tabs for editors?} + + This question comes up from time to time, so we have considered it + carefully. Here are our main reasons for not using tabs: + + \list + + \o Tabs do not scale. They work fine if you have 5 to 6 editors open, + they become cumbersome with 10, and if you need more horizontal + space than the tab bar, the interface does not work at all. + + \o Tabs do not adapt to your working set. + + \o The common solution is to give the user the ability to reorder + tabs. Now user has to manage tabs instead of writing code. + + \o Tabs force you to limit the amount of open editors, because + otherwise you get confused. + + \endlist + + Consider the following use case: \e {Developers want to switch editors.} + + In fact, developers do not want to switch editors, but might have to do so + to accomplish their tasks. We need to figure out what the tasks are to + provide developers with better ways to navigate while performing the tasks. + + One common factor in many use cases is switching editors while working on a + set of open files. While working on files A and B, users sometimes need to + look at file C. They can press \key Ctrl+Tab to move between the files and + have the files open in the correct editor according to file type. The list + is sorted by last used. + + Typically, users also work on multiple classes or functions that are + related, even though they are defined or declared in different files. + Qt Creator provides two shortcuts for that: \key F2 to follow the symbol + and \key Ctrl+Shift+U to find usages. + + In addition, developers can: + + \list + + \o Press \key F4 to switch between header and source. + + \o Press \key Alt+Left to move backwards in the navigation history. + + \o Use the locator (Ctrl+K) to simply tell Qt Creator where to go. + + \endlist + + The locator can be used to open files, but opening files is also just a + step on the way to accomplish a task. For example, consider the following + use case: \e {Fix AMethod in SomeClass which comes from + someclass.cpp/someclass.h}. + + With a tabbed user interface, developers would search for someclass.cpp in + the tab bar, and then search for \c {::AMethod}, only to find out that the + method is not located in that file. They would then search for someclass.h + in the tab bar, find our that the function is inline, fix the problem, and + forget where they came from. + + With Qt Creator, developers can type \c {Ctrl+K m AMet} to find the method. + Typically, they only need to type 3 to 4 characters of the method name. + They can then fix the problem and press \key Alt+Back to go back to where + they were. + + Other locator filters include \c c for classes, \c : for all symbols, and + (thanks to a community contribution) \c . for symbols in the current file. + +*/ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index c6e5eb68da5..a815cb3af13 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -153,8 +153,9 @@ \o \l{Showing Task List Files in the Build Issues Pane} \o \l{Using Command Line Options} \o \l{Getting Help} - \o \l{Tips and Tricks} \o \l{Keyboard Shortcuts} + \o \l{FAQ} + \o \l{Tips and Tricks} \o \l{Known Issues} \o \l{Glossary} \o \l{Acknowledgements} From 6187064f1b29426d64595fe56475dd92dcf80d05 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 4 Apr 2011 11:58:00 +0200 Subject: [PATCH 14/18] Debugger: Fix spelling error in tooltip. Last string change. Reviewed-by: Leena Miettinen --- src/plugins/debugger/gdb/gdboptionspage.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui index 704c95ba573..76d9fd8e00d 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.ui +++ b/src/plugins/debugger/gdb/gdboptionspage.ui @@ -46,7 +46,7 @@ This is the number of seconds Qt Creator will wait before -it terminates non-responsive gdb process. The default value of 20 seconds +it terminates a non-responsive gdb process. The default value of 20 seconds should be sufficient for most applications, but there are situations when loading big libraries or listing source files takes much longer than that on slow machines. In this case, the value should be increased. From 0812056acd74a8833a4702f6e0fca9595678f83d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 4 Apr 2011 12:01:00 +0200 Subject: [PATCH 15/18] Debugger: Fix spelling error in tooltip. Last string change. Reviewed-by: Leena Miettinen --- src/plugins/debugger/gdb/gdboptionspage.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui index 76d9fd8e00d..9400224b0ac 100644 --- a/src/plugins/debugger/gdb/gdboptionspage.ui +++ b/src/plugins/debugger/gdb/gdboptionspage.ui @@ -46,7 +46,7 @@ This is the number of seconds Qt Creator will wait before -it terminates a non-responsive gdb process. The default value of 20 seconds +it terminates a non-responsive GDB process. The default value of 20 seconds should be sufficient for most applications, but there are situations when loading big libraries or listing source files takes much longer than that on slow machines. In this case, the value should be increased. @@ -60,7 +60,7 @@ on slow machines. In this case, the value should be increased. This is the number of seconds Qt Creator will wait before -it terminates non-responsive GDB process. The default value of 20 seconds +it terminates a non-responsive GDB process. The default value of 20 seconds should be sufficient for most applications, but there are situations when loading big libraries or listing source files takes much longer than that on slow machines. In this case, the value should be increased. From 5cb6e9321e09f90a5bfd61a7c653f89b7fda64bd Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 4 Apr 2011 12:03:23 +0200 Subject: [PATCH 16/18] L10n: German translations for 2.2 --- share/qtcreator/translations/qtcreator_de.ts | 39 +++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 83aa575609d..fd398fa5e40 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -4819,7 +4819,7 @@ Add, modify, and remove document filters, which determine the documentation set Try to set breakpoints in plugins always automatically. - Versuche, Haltepunkte in Plugins automatisch zu setzen. + Versuche, Haltepunkte in Plugins automatisch zu setzen. Try to set breakpoints in selected plugins @@ -4839,7 +4839,7 @@ it terminates non-responsive gdb process. The default value of 20 seconds should be sufficient for most applications, but there are situations when loading big libraries or listing source files takes much longer than that on slow machines. In this case, the value should be increased. - Anzahl der Sekunden, die Qt Creator abwartet, bevor gdb-Prozesse abgebrochen werden, die nicht mehr reagieren. Die Vorgabe von 20 Sekunden sollte für die meisten Anwendungsfälle ausreichen, aber es können Situationen auftreten, in denen das Laden großer Bibliotheken oder das Auflisten der Quelldateien viel länger dauert (auf langsamen Maschinen). In diesem Falle sollte der Wert erhöht werden. + Anzahl der Sekunden, die Qt Creator abwartet, bevor gdb-Prozesse abgebrochen werden, die nicht mehr reagieren. Die Vorgabe von 20 Sekunden sollte für die meisten Anwendungsfälle ausreichen, aber es können Situationen auftreten, in denen das Laden großer Bibliotheken oder das Auflisten der Quelldateien viel länger dauert (auf langsamen Maschinen). In diesem Falle sollte der Wert erhöht werden. Enable reverse debugging @@ -4871,7 +4871,7 @@ on slow machines. In this case, the value should be increased. When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it. - Diese Option bewirkt, dass 'Einzelschritt in' in bestimmten Situationen mehrere Schritte zusammenfasst, was das Debuggen beschleunigt. Zum Beispiel wird der Code des atomaren Referenzzählung übersprungen; und bei der Emission eines Signals gelangt man direkt zum verbundenen Slot. + Diese Option bewirkt, dass 'Einzelschritt in' in bestimmten Situationen mehrere Schritte zusammenfasst, was das Debuggen beschleunigt. Zum Beispiel wird der Code des atomaren Referenzzählung übersprungen; und bei der Emission eines Signals gelangt man direkt zum verbundenen Slot. This will show a message box as soon as your application receives a signal like SIGSEGV during debugging. @@ -4905,6 +4905,23 @@ on slow machines. In this case, the value should be increased. Enable reverse debugging Selecting this enables reverse debugging. NOTE: This feature is very slow and unstable on the GDB side. It exhibits unpredictable behaviour when going backwards over system calls and is very likely to destroy your debugging session. Rückwärts-Debuggen aktivieren. Hinweis: Diese Funktionalität ist sehr instabil und langsam auf der GDB-Seite. Es kann unvorhersehbares Verhalten auftreten, wenn man rückwärts über einen Systemaufruf geht, und die Debugger-Sitzung kann leicht zerstört werden. + + This is the number of seconds Qt Creator will wait before +it terminates a non-responsive GDB process. The default value of 20 seconds +should be sufficient for most applications, but there are situations when +loading big libraries or listing source files takes much longer than that +on slow machines. In this case, the value should be increased. + Anzahl der Sekunden, die Qt Creator abwartet, bevor GDB-Prozesse abgebrochen werden, die nicht mehr reagieren. Die Vorgabe von 20 Sekunden sollte für die meisten Anwendungsfälle ausreichen, aber es können Situationen auftreten, in denen das Laden großer Bibliotheken oder das Auflisten der Quelldateien viel länger dauert (auf langsamen Maschinen). In diesem Falle sollte der Wert erhöht werden. + + + Allows 'Step Into' to compress several steps into one step for less noisy debugging. For example, the atomic reference + counting code is skipped, and a single 'Step Into' for a signal emission ends up directly in the slot connected to it. + Diese Option bewirkt, dass 'Einzelschritt in' in bestimmten Situationen mehrere Schritte zusammenfasst, was das Debuggen beschleunigt. Zum Beispiel wird der Code des atomaren Referenzzählung übersprungen; und bei der Emission eines Signals gelangt man direkt zum verbundenen Slot. + + + Try to set breakpoints in plugins always automatically + Versuche, Haltepunkte in Plugins automatisch zu setzen. + GeneralSettingsPage @@ -13732,7 +13749,7 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen. Use remote gdbserver - Gdb-Server benutzen + Gdb-Server benutzen Base environment for this run configuration: @@ -13756,7 +13773,7 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen. <b>Debugging details:</b> Use gdbserver - <b>Debuggereinstellung:</b> Benutze Gdb-Server + <b>Debuggereinstellung:</b> Benutze Gdb-Server Cancel Fetch Operation @@ -13786,10 +13803,18 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.Use remote GDB Entfernten GDB benutzen + + Use remote GDB server + GDB-Server benutzen + <b>Debugging details:</b> Use GDB <b>Debuggereinstellung:</b> Benutze GDB + + <b>Debugging details:</b> Use GDB server + <b>Debuggereinstellung:</b> Benutze GDB-Server + One local directory to be mounted on the device. Es existiert ein lokaler Ordner, der auf dem Mobilgerät angehängt werden kann (mount). @@ -19646,6 +19671,10 @@ Fehler: %2 Use GDB python dumpers + GDB-Python Dumper verwenden + + + Use GDB Python dumpers GDB-Python Dumper verwenden From 85cc7c29bc836c6eed562e2cd06c02ec50774b2a Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 4 Apr 2011 12:11:56 +0200 Subject: [PATCH 17/18] Doc: add copyright statement --- doc/qtcreator-faq.qdoc | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/doc/qtcreator-faq.qdoc b/doc/qtcreator-faq.qdoc index 77a1aa4dec1..a3da396138a 100644 --- a/doc/qtcreator-faq.qdoc +++ b/doc/qtcreator-faq.qdoc @@ -1,3 +1,30 @@ +/**************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Free Documentation License +** +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +****************************************************************************/ + /*! \contentspage index.html \previouspage creator-os-supported-platforms.html From 72c53945a7bff27303ff76df0060bb431f246767 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 4 Apr 2011 12:27:25 +0200 Subject: [PATCH 18/18] Doc: fix image name --- doc/qtcreator.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index a815cb3af13..02d8c35d6e5 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -1720,7 +1720,7 @@ and remove snippets in the snippet editor. To open the editor, select \gui {Tools > Options... > Text Editor > Snippets}. - \image qtcreator-edit-code-snippets "Snippet options" + \image qtcreator-edit-code-snippets.png "Snippet options" Qt Creator provides you with built-in snippets in the following categories: