diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 3d1fa7c834765218a8979ce30392045a42646115..67f803de6e93c2ee811b257ea9e5810cb2fefccb 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -1051,10 +1051,6 @@
</context>
<context>
<name>CodePaster::CodepasterPlugin</name>
- <message>
- <source>&CodePaster</source>
- <translation type="obsolete">&CodePaster</translation>
- </message>
<message>
<location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
<source>&Code Pasting</source>
@@ -2667,10 +2663,6 @@ Sollen sie überschrieben werden?</translation>
<source>Found an outdated version of the debugging helper library (%1); version %2 is required.</source>
<translation>Es wurde eine veraltete Version (%1) der Ausgabe-Hilfsbibliothek gefunden. Version %2 ist erforderlich.</translation>
</message>
- <message>
- <source>Found a too-old version of the debugging helper library (%1); version %2 is required.</source>
- <translation type="obsolete">Es wurde eine veraltete Version (%1) der Ausgabe-Hilfsbibliothek gefunden. Version %2 ist erforderlich.</translation>
- </message>
<message numerus="yes">
<location line="+37"/>
<source>%n known types, Qt version: %1, Qt namespace: %2 Dumper version: %3</source>
@@ -2819,10 +2811,6 @@ Sollen sie überschrieben werden?</translation>
<source>Open Qt preferences</source>
<translation>Qt-Versionseinstellungen öffnen</translation>
</message>
- <message>
- <source>Turn helper usage off</source>
- <translation type="obsolete">Ausgabe-Hilfsbibliothek deaktivieren</translation>
- </message>
<message>
<location line="+4"/>
<source>Continue anyway</source>
@@ -2833,14 +2821,6 @@ Sollen sie überschrieben werden?</translation>
<source>Debugging helper missing</source>
<translation>Ausgabe-Hilfsbibliothek nicht gefunden</translation>
</message>
- <message>
- <source>The debugger did not find the debugging helper library.</source>
- <translation type="obsolete">Der Debugger konnte die Ausgabe-Hilfsbibliothek nicht finden.</translation>
- </message>
- <message>
- <source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each Qt version which you can do in the Qt preferences page by selecting a Qt installation and clicking on 'Rebuild' for the debugging helper.</source>
- <translation type="obsolete">Die Ausgabe-Hilfsbibliothek dient zur Ausgabe der Werte einiger Datentypen aus Qt- und den Standardbibliotheken. Sie muss mit jeder benutzten Qt-Version compiliert werden. Das geschieht in der Seite 'Qt-Einstellungen' durch Auswahl der Qt-Installation und Klicken auf 'Erstellen' für die Ausgabe-Hilfsbibliothek.</translation>
- </message>
<message>
<location line="+166"/>
<source>Stop Debugger</source>
@@ -3314,10 +3294,6 @@ Sollen sie überschrieben werden?</translation>
<source>Initializing dumpers...</source>
<translation>Ausgabe-Hilfsbibliothek initialisieren...</translation>
</message>
- <message>
- <source>Custom dumper library initialized.</source>
- <translation type="obsolete">Ausgabe-Hilfsbibliothek wurde initialisiert.</translation>
- </message>
<message>
<location line="-39"/>
<source>The custom dumper library could not be initialized: %1</source>
@@ -3425,22 +3401,6 @@ Sollen sie überschrieben werden?</translation>
<translation>Das Debuggen der core-Datei "%1" schlug fehl:
</translation>
</message>
- <message>
- <source>No binary found.</source>
- <translation type="obsolete">Es konnte keine ausführbare Datei gefunden werden.</translation>
- </message>
- <message>
- <source>Symbols not found in "%1" failed:
-%2</source>
- <translation type="obsolete">In "%1" konnten keine Symbole gefunden werden; Fehler:
-%2</translation>
- </message>
- <message>
- <source>Attach to core "%1" failed:
-%2</source>
- <translation type="obsolete">Das Debuggen der core-Datei "%1" schlug fehl:
-%2</translation>
- </message>
</context>
<context>
<name>Debugger::Internal::DebugMode</name>
@@ -3828,10 +3788,6 @@ Sollen sie überschrieben werden?</translation>
<source>An error occurred when attempting to read from the Gdb process. For example, the process may not be running.</source>
<translation>Ein Fehler trat beim Versuch des Lesens vom Gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht.</translation>
</message>
- <message>
- <source>Error</source>
- <translation type="obsolete">Fehler</translation>
- </message>
<message>
<location line="+117"/>
<source>Library %1 loaded.</source>
@@ -3893,10 +3849,6 @@ Sollen sie überschrieben werden?</translation>
<source>Signal received</source>
<translation>Signal erhalten</translation>
</message>
- <message>
- <source>The dumper library was not found at %1.</source>
- <translation type="obsolete">Es konnte keine Ausgabe-Hilfsbibliothek unter %1 gefunden werden.</translation>
- </message>
<message>
<location line="-671"/>
<source>Reading %1...</source>
@@ -3907,10 +3859,6 @@ Sollen sie überschrieben werden?</translation>
<source>Jumped. Stopped.</source>
<translation>Sprung ausgeführt/ Angehalten.</translation>
</message>
- <message>
- <source>Run to Function finished. Stopped.</source>
- <translation type="obsolete">Ausgeführung bis zu Funktion beendet. Angehalten.</translation>
- </message>
<message>
<location line="+161"/>
<source>Loading %1...</source>
@@ -3939,12 +3887,6 @@ Using gdb 6.7 or later is strongly recommended.</source>
<translation>Diese Version wird von Qt Creator nicht offiziell unterstützt.
Das Debuggen wird wahrscheinlich nicht richtig funktionieren.
Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
- </message>
- <message>
- <source>Starting executable failed:
-</source>
- <translation type="obsolete">Das Starten der ausführbaren Datei schlug fehl:
-</translation>
</message>
<message>
<location line="-210"/>
@@ -4006,11 +3948,6 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<source>Retrieving data for stack view...</source>
<translation>Daten der Stack-Anzeige werden empfangen...</translation>
</message>
- <message>
- <source><not in scope></source>
- <extracomment>Variable</extracomment>
- <translation type="obsolete"><nicht im Bereich></translation>
- </message>
<message numerus="yes">
<location line="+495"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
@@ -4072,10 +4009,6 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<source>Executable failed: %1</source>
<translation>Fehler bei Ausführung: %1</translation>
</message>
- <message>
- <source>Function reached. Stopped.</source>
- <translation type="obsolete">Die Funktion wurde erreicht. Angehalten.</translation>
- </message>
<message>
<location line="+211"/>
<source>Program exited with exit code %1.</source>
@@ -4091,10 +4024,6 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<source>Program exited normally.</source>
<translation>Das Programm wurde normal beendet.</translation>
</message>
- <message>
- <source>Starting executable failed</source>
- <translation type="obsolete">Das Starten der ausführbaren Datei schlug fehl</translation>
- </message>
<message>
<location line="+482"/>
<source>Continuing after temporary stop...</source>
@@ -4155,11 +4084,6 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<source><0 items></source>
<translation><leer></translation>
</message>
- <message>
- <source>%1 <shadowed %2></source>
- <extracomment>Variable %1 is the variable name, %2 is a simple count</extracomment>
- <translation type="obsolete">%1 <überlagert %2></translation>
- </message>
<message>
<location line="+224"/>
<source><shadowed></source>
@@ -4181,22 +4105,6 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<extracomment>About variable's value</extracomment>
<translation><keine Angabe></translation>
</message>
- <message>
- <source>Unknown error: </source>
- <translation type="obsolete">Unbekannter Fehler: </translation>
- </message>
- <message>
- <source>Dumper injection loading triggered (%1)...</source>
- <translation type="obsolete">Das Laden der Ausgabe-Hilfsbibliothek (%1) per Injektion wurde gestartet...</translation>
- </message>
- <message>
- <source>Dumper loading (%1) failed: %2</source>
- <translation type="obsolete">Das Laden der Ausgabe-Hilfsbibliothek (%1) schlug fehl: %2</translation>
- </message>
- <message>
- <source>Loading dumpers via debugger call (%1)...</source>
- <translation type="obsolete">Lade die Ausgabe-Hilfsbibliothek (%1) per Debugger-Aufruf...</translation>
- </message>
<message>
<location line="+333"/>
<location line="+25"/>
@@ -4234,14 +4142,6 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<source>Adapter start failed</source>
<translation>Der Start des Adapters schlug fehl</translation>
</message>
- <message>
- <source>Inferior start preparation failed</source>
- <translation type="obsolete">Die Vorbereitung des zu debuggenden Prozesses schlug fehl</translation>
- </message>
- <message>
- <source>Inferior prepared for startup.</source>
- <translation type="obsolete">Zu debuggender Prozess vorbereitet.</translation>
- </message>
<message>
<location line="+24"/>
<source>Setting breakpoints...</source>
@@ -4267,10 +4167,6 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<source>Adapter crashed</source>
<translation>Der Adapter ist abgestürzt</translation>
</message>
- <message>
- <source>Adapter shutdown failed</source>
- <translation type="obsolete">Das Beenden des Adapter schlug fehl</translation>
- </message>
</context>
<context>
<name>Debugger::Internal::GdbOptionsPage</name>
@@ -4505,10 +4401,6 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
</context>
<context>
<name>Debugger::Internal::RemoteGdbAdapter</name>
- <message>
- <source>The upload process failed to start. Either the invoked script '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
- <translation type="obsolete">Das Hochladen konnte nicht gestartet weden. Entweder fehlt das Skript '%1', oder die Berechtigungen sind nicht ausreichend.</translation>
- </message>
<message>
<location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+93"/>
<source>The upload process failed to start. Shell missing?</source>
@@ -4825,12 +4717,6 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<source>Connecting to TRK server adapter failed:
</source>
<translation>Die Verbindung zum TRK-Server-Adapter schlug fehl:
-</translation>
- </message>
- <message>
- <source>Connecting to trk server adapter failed:
-</source>
- <translation type="obsolete">Die Verbindung zum Trk-Server-Adapter schlug fehl:
</translation>
</message>
</context>
@@ -8390,10 +8276,6 @@ p, li { white-space: pre-wrap; }
<source>Code Pasting</source>
<translation>Code Pasting</translation>
</message>
- <message>
- <source>CodePaster</source>
- <translation type="obsolete">CodePaster</translation>
- </message>
</context>
<context>
<name>PasteView</name>
@@ -9353,7 +9235,7 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::BuildSettingsPanel</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+80"/>
+ <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+81"/>
<source>Build Settings</source>
<translation>'Build'-Einstellungen</translation>
</message>
@@ -9361,7 +9243,7 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::BuildSettingsWidget</name>
<message>
- <location line="+118"/>
+ <location line="+137"/>
<source>&Clone Selected</source>
<translation>Auswahl duplizieren</translation>
</message>
@@ -9371,7 +9253,7 @@ Fehler: %2</translation>
<translation>Erstellungsschritte</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-98"/>
<source>Edit Build Configuration:</source>
<translation>Build-Konfiguration bearbeiten:</translation>
</message>
@@ -9386,12 +9268,17 @@ Fehler: %2</translation>
<translation>Entfernen</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+88"/>
<source>Clean Steps</source>
<translation>Schritte zur Bereinigung</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+48"/>
+ <source><a href="#">Make %1 active.</a></source>
+ <translation><a href="#">Setze %1 aktiv.</a></translation>
+ </message>
+ <message>
+ <location line="+33"/>
<source>New Configuration Name:</source>
<translation>Name der neuen Konfiguration:</translation>
</message>
@@ -10025,6 +9912,11 @@ Fehler: %2</translation>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
+ <message>
+ <location line="+133"/>
+ <source><a href="#">Make %1 active.</a></source>
+ <translation><a href="#">Setze %1 aktiv.</a></translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::Internal::SessionDialog</name>
@@ -10152,7 +10044,7 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::ProjectExplorerPlugin</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+256"/>
+ <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+257"/>
<source>Projects</source>
<translation>Projekte</translation>
</message>
@@ -10385,7 +10277,7 @@ Fehler: %2</translation>
<translation>Bereinigen unter Ausschluss der Abhängigkeiten</translation>
</message>
<message>
- <location line="+1148"/>
+ <location line="+1181"/>
<source>New File</source>
<comment>Title of dialog</comment>
<translation>Neue Datei</translation>
@@ -10474,6 +10366,49 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation>Die Datei %1 konnte nicht gelöscht werden.</translation>
</message>
</context>
+<context>
+ <name>ProjectExplorer::Internal::BuildConfigDialog</name>
+ <message>
+ <location line="+227"/>
+ <source>This can happen if the active build configuration uses the wrong Qt version and/or tool chain for the active run configuration (for example, running in Symbian emulator requires building with the WINSCW tool chain).</source>
+ <translation>Das kann passieren, wenn die aktive Build-Konfiguration eine für die aktive Ausführungskonfiguration ungeeignete Qt-Version und/oder Toolchain benutzt (zum Beispiel erfordert die Ausführung im Symbian-Emulator die Toolchain WINSCW).</translation>
+ </message>
+ <message>
+ <location line="-6"/>
+ <source>Run configuration does not match build configuration</source>
+ <translation>Die Ausführungskonfiguration entspricht nicht der Build-Konfiguration</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>Change build configuration && continue</source>
+ <translation>Ändere Build-Konfiguration und setze fort</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Cancel</source>
+ <translation>Abbrechen</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Continue anyway</source>
+ <translation>Trotzdem fortsetzen</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The active build configuration builds a target that cannot be used by the active run configuration.</source>
+ <translation>Die aktive Build-Konfiguration erstellt ein Ziel, was von der aktive Ausführungskonfiguration nicht verwendet werden kann.</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Choose build configuration:</source>
+ <translation>Build-Konfiguration wählen:</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>No valid build configuration found.</source>
+ <translation>Es konnte keine gültige Build-Konfiguration gefunden werden.</translation>
+ </message>
+</context>
<context>
<name>ProjectExplorer::SessionManager</name>
<message>
@@ -10574,7 +10509,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+9"/>
<source>Warning</source>
- <translation type="unfinished">Warnung</translation>
+ <translation>Warnung</translation>
</message>
<message>
<location line="+1"/>
@@ -11370,8 +11305,8 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
</message>
<message>
<location line="+2"/>
- <source>In the editor, <tt>F2</tt> toggles declaration and definition while <tt>F4</tt> toggles header file and source file.</source>
- <translation>Im Editor können Sie <tt>F2</tt> verwenden, um zwischen Deklaration und Definition umzuschalten. <tt>F4</tt> schaltet zwischen Header- und Quelldatei um.</translation>
+ <source>In the editor, <tt>F2</tt> follows symbol definition, <tt>Shift+F2</tt> toggles declaration and definition while <tt>F4</tt> toggles header file and source file.</source>
+ <translation>Im Editor können Sie <tt>F2</tt> verwenden, um ein Symbol zu verfolgen; <tt>Shift+F2</tt> wechselt zwischen Deklaration und Definition. <tt>F4</tt> schaltet zwischen Header- und Quelldatei um.</translation>
</message>
</context>
<context>
@@ -11598,10 +11533,6 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
</context>
<context>
<name>Qt4ProjectManager::Internal::ProjectLoadWizard</name>
- <message>
- <source>Import existing settings</source>
- <translation type="obsolete">Existierende Einstellungen importieren</translation>
- </message>
<message>
<location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+51"/>
<location line="+125"/>
@@ -11909,10 +11840,6 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<source>Select the MinGW Directory</source>
<translation>Wählen Sie das MinGW-Verzeichnis aus</translation>
</message>
- <message>
- <source>Select "x86build" Directory from Carbide Install</source>
- <translation type="obsolete">Geben Sie das "x86build"-Verzeichnis aus der Carbide-Installation an</translation>
- </message>
<message>
<location line="+2"/>
<source>Select Carbide Install Directory</source>
@@ -11923,6 +11850,11 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<source>Select S60 SDK Root</source>
<translation>Hauptordner des S60 SDK auswählen</translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>Select the CSL Arm Toolchain (GCCE) Directory</source>
+ <translation>Ordner der CSL Arm Toolchain (GCCE)</translation>
+ </message>
<message>
<location line="+11"/>
<source>Auto-detected</source>
@@ -11934,7 +11866,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation>Benutzerdefiniert</translation>
</message>
<message>
- <location line="+142"/>
+ <location line="+144"/>
<source>Building helpers</source>
<translation>Ausgabe-Hilfsbibliothek</translation>
</message>
@@ -11945,7 +11877,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<translation><html><body><table><tr><td>Datei:</td><td><pre>%1</pre></td></tr><tr><td>Letzte Änderung:</td><td>%2</td></tr><tr><td>Größe:</td><td>%3 Bytes</td></tr></table></body></html></translation>
</message>
<message>
- <location line="+120"/>
+ <location line="+124"/>
<source>The Qt Version identified by %1 is not installed. Run make install</source>
<translation>Die Qt-Version %1 ist nicht installiert. Führen Sie make install aus</translation>
</message>
@@ -12035,10 +11967,6 @@ p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Die MSVC-Version konnte nicht bestimmt werden.</span></p></body></html></translation>
</message>
- <message>
- <source>MWC Directory:</source>
- <translation type="obsolete">MWC-Verzeichnis:</translation>
- </message>
<message>
<location/>
<source>QMake Location</source>
@@ -12059,6 +11987,11 @@ p, li { white-space: pre-wrap; }
<source>Carbide Directory:</source>
<translation>Carbide-Ordner:</translation>
</message>
+ <message>
+ <location/>
+ <source>CLS/GCCE Directory:</source>
+ <translation>CLS/GCCE:</translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::QtWizard</name>
@@ -12071,7 +12004,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceDebugRunControl</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+828"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+836"/>
<source>Warning: Cannot locate the symbol file belonging to %1.</source>
<translation>Warnung: Die zu %1 gehörige Symboldatei konnte nicht gefunden werden.</translation>
</message>
@@ -12089,17 +12022,17 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfiguration</name>
<message>
- <location line="-756"/>
+ <location line="-764"/>
<source>QtS60DeviceRunConfiguration</source>
<translation>QtS60DeviceRunConfiguration</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+205"/>
<source>Could not parse %1. The QtS60 Device run configuration %2 can not be started.</source>
<translation>%1 konnte nicht ausgewertet werden. Die Qt S60-Ausführungskonfiguration %2 kann nicht gestartet werden.</translation>
</message>
<message>
- <location line="-199"/>
+ <location line="-207"/>
<source>%1 on Symbian Device</source>
<translation>%1 auf Symbian-Gerät</translation>
</message>
@@ -12107,7 +12040,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
<message>
- <location line="+286"/>
+ <location line="+294"/>
<source>%1 on Symbian Device</source>
<translation>%1 auf Symbian-Gerät</translation>
</message>
@@ -12276,12 +12209,6 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
Deploying application to '%2'...</source>
<translation>Installationspaket: %1
Installiere Anwendung auf '%2'...</translation>
- </message>
- <message>
- <source>Could not connect to phone on port '%1': %2
-Check if the phone is connected and the TRK application is running.</source>
- <translation type="obsolete">Die Verbindung zum Gerät über den Port '%1' konnte nicht hergestellt werden: %2
-Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK' läuft.</translation>
</message>
<message>
<location line="+30"/>
@@ -12455,7 +12382,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60Manager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+112"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+113"/>
<source>Run in Emulator</source>
<translation>Im Emulator ausführen</translation>
</message>
@@ -12656,7 +12583,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<translation>Es wird die Qt-Version "%1" benutzt</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+26"/>
<source>New configuration</source>
<translation>Neue Konfiguration</translation>
</message>
@@ -12666,7 +12593,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<translation>Name der neuen Konfiguration:</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+7"/>
<source>%1 Debug</source>
<translation>%1 Debug</translation>
</message>
@@ -12713,7 +12640,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+349"/>
+ <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+351"/>
<source><not found></source>
<translation><nicht gefunden></translation>
</message>
@@ -12767,7 +12694,7 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>QApplication</name>
<message>
- <location line="+862"/>
+ <location line="+872"/>
<source>The Qt Version has no toolchain.</source>
<translation>Dieser Qt-Version ist keine Toolchain zugeordnet.</translation>
</message>
@@ -13177,37 +13104,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<translation><Tippen Sie hier></translation>
</message>
</context>
-<context>
- <name>Locator::Internal::SettingsDialog</name>
- <message>
- <source>Configure Filters</source>
- <translation type="obsolete">Filter konfigurieren</translation>
- </message>
- <message>
- <source>Add</source>
- <translation type="obsolete">Hinzufügen</translation>
- </message>
- <message>
- <source>Remove</source>
- <translation type="obsolete">Entfernen</translation>
- </message>
- <message>
- <source> min</source>
- <translation type="obsolete"> minuten</translation>
- </message>
- <message>
- <source>Refresh now!</source>
- <translation type="obsolete">Jetzt aktualisieren!</translation>
- </message>
- <message>
- <source>Edit...</source>
- <translation type="obsolete">Ändern...</translation>
- </message>
- <message>
- <source>Refresh Interval:</source>
- <translation type="obsolete">Aktualisierungsintervall:</translation>
- </message>
-</context>
<context>
<name>Locator::Internal::SettingsPage</name>
<message>
@@ -15779,7 +15675,7 @@ Qt Centre</translation>
<message>
<location line="+1"/>
<source>Qt Apps</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Apps</translation>
</message>
<message>
<location line="+1"/>
@@ -15864,10 +15760,6 @@ Qt Centre</translation>
</context>
<context>
<name>Debugger::Internal::TrkOptionsPage</name>
- <message>
- <source>Symbian Trk</source>
- <translation type="obsolete">Symbian-Trk</translation>
- </message>
<message>
<location filename="../../../src/plugins/debugger/gdb/trkoptionspage.cpp" line="+43"/>
<source>Symbian TRK</source>
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 04230db5bb8abc942525dda3eda3f1f775b07c53..44453ff47cee2b6af1428be5f037bfb7555a06bd 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -776,6 +776,7 @@ void GdbEngine::handleResultRecord(GdbResponse *response)
// Handle a case known to occur on Linux/gdb 6.8 when debugging moc
// with helpers enabled. In this case we get a second response with
// msg="Cannot find new threads: generic error"
+ debugMessage(_("APPLYING WORKAROUND #1"));
showMessageBox(QMessageBox::Critical,
tr("Executable failed"), QString::fromLocal8Bit(msg));
showStatusMessage(tr("Process failed to start."));
@@ -783,14 +784,28 @@ void GdbEngine::handleResultRecord(GdbResponse *response)
} else if (msg == "\"finish\" not meaningful in the outermost frame.") {
// Handle a case known to appear on gdb 6.4 symbianelf when
// the stack is cut due to access to protected memory.
+ debugMessage(_("APPLYING WORKAROUND #2"));
setState(InferiorStopping);
setState(InferiorStopped);
} else if (msg.startsWith("Cannot find bounds of current function")) {
// Happens when running "-exec-next" in a function for which
// there is no debug information. Divert to "-exec-next-step"
+ debugMessage(_("APPLYING WORKAROUND #3"));
setState(InferiorStopping);
setState(InferiorStopped);
nextIExec();
+ } else if (msg.startsWith("Couldn't get registers: No such process.")) {
+ // Happens on archer-tromey-python 6.8.50.20090910-cvs
+ // There might to be a race between a process shutting down
+ // and library load messages.
+ debugMessage(_("APPLYING WORKAROUND #4"));
+ setState(InferiorStopping);
+ setState(InferiorStopped);
+ showStatusMessage(tr("Executable failed: %1")
+ .arg(QString::fromLocal8Bit(msg)));
+ shutdown();
+ showMessageBox(QMessageBox::Critical,
+ tr("Executable failed"), QString::fromLocal8Bit(msg));
} else {
showMessageBox(QMessageBox::Critical,
tr("Executable failed"), QString::fromLocal8Bit(msg));
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index b29a76a7d3e1ae7b7e9ad560e3cadc1b1f4cbecd..8a86b5944bc30f6b8ad1ba33edfc0e7ab34e8cf8 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2153,7 +2153,7 @@ BuildConfigDialog::BuildConfigDialog(Project *project, QWidget *parent)
connect(m_changeBuildConfiguration, SIGNAL(clicked()), this, SLOT(buttonClicked()));
connect(m_cancel, SIGNAL(clicked()), this, SLOT(buttonClicked()));
connect(m_justContinue, SIGNAL(clicked()), this, SLOT(buttonClicked()));
- setWindowTitle(tr("Run configuration doesn't match build configuration"));
+ setWindowTitle(tr("Run configuration does not match build configuration"));
QLabel *shortText = new QLabel(tr(
"The active build configuration builds a target "
"that cannot be used by the active run configuration."
@@ -2162,7 +2162,7 @@ BuildConfigDialog::BuildConfigDialog(Project *project, QWidget *parent)
QLabel *descriptiveText = new QLabel(tr(
"This can happen if the active build configuration "
"uses the wrong Qt version and/or tool chain for the active run configuration "
- "(e.g. running in Symbian emulator requires building with WINSCW tool chain)."
+ "(for example, running in Symbian emulator requires building with the WINSCW tool chain)."
));
descriptiveText->setWordWrap(true);
vlayout->addWidget(descriptiveText);
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 1dc697467892dd45ba832dd878fe3e92d0da280b..51bf50d5554d4018bea4100ce4e57e3edb3d159b 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -1,4 +1,4 @@
-
+//
//bool checkUninitialized = true;
bool checkUninitialized = false;
//#define DO_DEBUG 1
@@ -7,10 +7,19 @@ bool checkUninitialized = false;
#include <QtCore/QMutex>
#include <QtCore/QWaitCondition>
-#include <QtCore/private/qobject_p.h>
-//#include <QtGui/QStandardItemModel>
-//#include <QtGui/QStringListModel>
+/*
+#include <QtGui/QBitmap>
+#include <QtGui/QBrush>
+#include <QtGui/QColor>
+#include <QtGui/QCursor>
+#include <QtGui/QFont>
+#include <QtGui/QIcon>
+#include <QtGui/QKeySequence>
+#include <QtGui/QQuaternion>
+#include <QtGui/QStandardItemModel>
+#include <QtGui/QStringListModel>
+*/
#include <QtTest/QtTest>
@@ -194,6 +203,8 @@ private slots:
void dump_Foo();
void dump_QByteArray();
void dump_QChar();
+ void dump_QHash_int_int();
+ void dump_QHash_QString_QString();
void dump_QList_char();
void dump_QList_char_star();
void dump_QList_int();
@@ -201,16 +212,18 @@ private slots:
void dump_QList_QString();
void dump_QList_QString3();
void dump_QList_Int3();
+ void dump_QPoint();
+ void dump_QRect();
+ void dump_QSize();
void dump_QStack();
void dump_QString();
void dump_QStringList();
+ void dump_QVariant();
+ void dump_QVector();
void dump_QWeakPointer_11();
void dump_QWeakPointer_12();
void dump_QWeakPointer_13();
void dump_QWeakPointer_2();
- void dump_QVector();
-
- void dump_QHash();
public slots:
void dumperCompatibility();
@@ -239,9 +252,6 @@ public slots:
void dump_QPixmap();
void dump_QSharedPointer();
void dump_QTextCodec();
- void dump_QVariant_invalid();
- void dump_QVariant_QString();
- void dump_QVariant_QStringList();
void dumpStdVector();
#endif
@@ -642,7 +652,7 @@ void tst_Gdb::initTestCase()
funcName = ba.mid(5, pos - 5) + '@';
} else if (ba.startsWith(" /*")) {
int pos = ba.indexOf('*', 7);
- m_lineForLabel[funcName + ba.mid(7, pos - 8)] = i + 1;
+ m_lineForLabel[(funcName + ba.mid(7, pos - 8)).trimmed()] = i + 1;
}
}
m_thread.startup(gdbProc);
@@ -677,6 +687,9 @@ void tst_Gdb::run(const QByteArray &label, const QByteArray &expected0,
//qDebug() << "OUTPUT: " << locals.toString() << "\n\n";
QByteArray actual = received.trimmed();
+ int pos = actual.indexOf("^done");
+ if (pos != -1)
+ actual = actual.left(pos);
if (actual.endsWith("\\n"))
actual.chop(2);
QByteArray expected = "locals={iname='local',name='Locals',value=' ',type=' ',"
@@ -1345,59 +1358,6 @@ void tst_Gdb::dump_QFileInfo()
testDumper(expected, &fi, NS"QFileInfo", true);
}
-void tst_Gdb::dump_QHash()
-{
- QHash<QString, QList<int> > hash;
- hash.insert("Hallo", QList<int>());
- hash.insert("Welt", QList<int>() << 1);
- hash.insert("!", QList<int>() << 1 << 2);
- hash.insert("!", QList<int>() << 1 << 2);
-}
-
-template <typename K, typename V>
-void tst_Gdb::dump_QHashNodeHelper(QHash<K, V> &hash)
-{
- typename QHash<K, V>::iterator it = hash.begin();
- typedef QHashNode<K, V> HashNode;
- HashNode *dummy = 0;
- HashNode *node =
- reinterpret_cast<HashNode *>(reinterpret_cast<char *>(const_cast<K *>(&it.key())) -
- size_t(&dummy->key));
- const K &key = it.key();
- const V &val = it.value();
- QByteArray expected("value='");
- if (isSimpleType<V>())
- expected.append(valToString(val));
- expected.append("',numchild='2',children=[{name='key',type='").
- append(typeToString<K>()).append("',addr='").append(ptrToBa(&key)).
- append("'},{name='value',type='").append(typeToString<V>()).
- append("',addr='").append(ptrToBa(&val)).append("'}]");
- testDumper(expected, node, NS"QHashNode", true,
- getMapType<K, V>(), "", sizeof(it.key()), sizeof(it.value()));
-}
-
-void tst_Gdb::dump_QHashNode()
-{
- // Case 1: simple type -> simple type.
- QHash<int, int> hash1;
- hash1[2] = 3;
- dump_QHashNodeHelper(hash1);
-
- // Case 2: simple type -> composite type.
- QHash<int, QString> hash2;
- hash2[5] = "String 7";
- dump_QHashNodeHelper(hash2);
-
- // Case 3: composite type -> simple type
- QHash<QString, int> hash3;
- hash3["String 11"] = 13;
- dump_QHashNodeHelper(hash3);
-
- // Case 4: composite type -> composite type
- QHash<QString, QString> hash4;
- hash4["String 17"] = "String 19";
- dump_QHashNodeHelper(hash4);
-}
void tst_Gdb::dump_QImageHelper(const QImage &img)
{
@@ -2375,38 +2335,6 @@ void tst_Gdb::dump_QSharedPointer()
#endif
}
-void tst_Gdb::dump_QVariant_invalid()
-{
- QVariant v;
- testDumper("value='(invalid)',type='$T',numchild='0'",
- &v, NS"QVariant", false);
-}
-
-void tst_Gdb::dump_QVariant_QString()
-{
- QVariant v = "abc";
- testDumper("value='KFFTdHJpbmcpICJhYmMi',valueencoded='5',type='$T',"
- "numchild='0'",
- &v, NS"QVariant", true);
-/*
- FIXME: the QString version should have a child:
- testDumper("value='KFFTdHJpbmcpICJhYmMi',valueencoded='5',type='$T',"
- "numchild='1',children=[{name='value',value='IgBhAGIAYwAiAA==',"
- "valueencoded='4',type='QString',numchild='0'}]",
- &v, NS"QVariant", true);
-*/
-}
-
-void tst_Gdb::dump_QVariant_QStringList()
-{
- QVariant v = QStringList() << "Hi";
- testDumper("value='(QStringList) ',type='$T',numchild='1',"
- "children=[{name='value',exp='(*('myns::QStringList'*)%)',"
- "type='QStringList',numchild='1'}]"
- << QByteArray::number(quintptr(&v)),
- &v, NS"QVariant", true);
-}
-
void tst_Gdb::dump_StdVector()
{
std::vector<std::list<int> *> vector;
@@ -2453,6 +2381,235 @@ void tst_Gdb::dump_QTextCodec()
#endif // #if 0
+///////////////////////////// QVariant /////////////////////////////////
+
+void dump_QVariant()
+{
+ /*<not in scope>*/ QVariant v;
+ /* <invalid> */ v = QBitArray();
+ /* QBitArray */ v = 0; // QBitmap();
+ /* QBitMap */ v = bool(true);
+ /* bool */ v = 0; // QBrush();
+ /* QBrush */ v = QByteArray("abc");
+ /* QByteArray */ v = QChar(QLatin1Char('x'));
+ /* QChar */ v = 0; // QColor();
+ /* QColor */ v = 0; // QCursor();
+ /* QCursor */ v = QDate();
+ /* QDate */ v = QDateTime();
+ /* QDateTime */ v = double(46);
+ /* double */ v = 0; // QFont();
+ /* QFont */ v = QVariantHash();
+ /* QVariantHash */ v = 0; // QIcon();
+ /* QIcon */ v = 0; // QImage();
+ /* QImage */ v = int(42);
+ /* int */ v = 0; // QKeySequence();
+ /* QKeySequence */ v = QLine();
+ /* QLine */ v = QLineF();
+ /* QLineF */ v = QVariantList();
+ /* QVariantList */ v = QLocale();
+ /* QLocale */ v = qlonglong(44);
+ /* qlonglong */ v = QVariantMap();
+ /* QVariantMap */ v = 0; // QTransform();
+ /* QTransform */ v = 0; // QMatrix4x4();
+ /* QMatrix4x4 */ v = 0; // QPalette();
+ /* QPalette */ v = 0; // QPen();
+ /* QPen */ v = 0; // QPixmap();
+ /* QPixmap */ v = QPoint(45, 46);
+ /* QPoint */ v = 0; // QPointArray();
+ /* QPointArray */ v = QPointF(41, 42);
+ /* QPointF */ v = 0; // QPolygon();
+ /* QPolygon */ v = 0; // QQuaternion();
+ /* QQuaternion */ v = QRect();
+ /* QRect */ v = QRectF();
+ /* QRectF */ v = QRegExp("abc");
+ /* QRegExp */ v = 0; // QRegion();
+ /* QRegion */ v = QSize(0, 0);
+ /* QSize */ v = QSizeF(0, 0);
+ /* QSizeF */ v = 0; // QSizePolicy();
+ /* QSizePolicy */ v = QString("abc");
+ /* QString */ v = QStringList() << "abc";
+ /* QStringList */ v = 0; // QTextFormat();
+ /* QTextFormat */ v = 0; // QTextLength();
+ /* QTextLength */ v = QTime();
+ /* QTime */ v = uint(43);
+ /* uint */ v = qulonglong(45);
+ /* qulonglong */ v = QUrl("http://foo");
+ /* QUrl */ v = 0; // QVector2D();
+ /* QVector2D */ v = 0; // QVector3D();
+ /* QVector3D */ v = 0; // QVector4D();
+ /* QVector4D */ (void) 0;
+}
+
+void tst_Gdb::dump_QVariant()
+{
+ #define PRE "iname='local.v',addr='-',name='v',type='"NS"QVariant',"
+ prepare("dump_QVariant");
+ if (checkUninitialized) /*<not in scope>*/
+ run("A","{"PRE"'value=<not in scope>',numchild='0'}");
+ next();
+ run("<invalid>", "{"PRE"value='<invalid>',numchild='0'}");
+ next();
+ run("QBitArray", "{"PRE"value='("NS"QBitArray)',numchild='1',children=["
+ "{name='data',type='"NS"QBitArray',value='{...}',numchild='1'}]}",
+ "local.v");
+ next();
+ //run("QBitMap", "{"PRE"value="NS"QBitMap'',numchild='1',children=["
+ // "]}", "local.v");
+ next();
+ run("bool", "{"PRE"value='true',numchild='0'}", "local.v");
+ next();
+ //run("QBrush", "{"PRE"value='"NS"QBrush',numchild='1',children=["
+ // "]}", "local.v");
+ next();
+ run("QByteArray", "{"PRE"value='("NS"QByteArray)',numchild='1',"
+ "children=[{name='data',type='"NS"QByteArray',valueencoded='6',"
+ "value='616263',numchild='3'}]}", "local.v");
+ next();
+ run("QChar", "{"PRE"value='("NS"QChar)',numchild='1',"
+ "children=[{name='data',type='"NS"QChar',value=''x', ucs=120',numchild='0'}]}", "local.v");
+ next();
+ //run("QColor", "{"PRE"value='("NS"QColor)',numchild='1',children=["
+ // "]}", "local.v");
+ next();
+ //run("QCursor", "{"PRE"value='',numchild='1',children=["
+ // "]}", "local.v");
+ next();
+ run("QDate", "{"PRE"value='("NS"QDate)',numchild='1',children=["
+ "{name='data',type='"NS"QDate',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("QDateTime", "{"PRE"value='("NS"QDateTime)',numchild='1',children=["
+ "{name='data',type='"NS"QDateTime',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("double", "{"PRE"value='46',numchild='0'}", "local.v");
+ next();
+ //run("QFont", "{"PRE"value='(NS"QFont")',numchild='1',children=["
+ // "{name='data',type='"NS"QFont',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("QVariantHash", "{"PRE"value='("NS"QVariantHash)',numchild='1',children=["
+ "{name='data',type='"NS"QHash<"NS"QString, "NS"QVariant>',"
+ "value='<0 items>',numchild='0'}]}", "local.v");
+ next();
+ //run("QIcon", "{"PRE"value='("NS"QIcon)',numchild='1',children=["
+ // "{name='data',type='"NS"QIcon',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QImage", "{"PRE"value='("NS"QImage)',numchild='1',children=["
+ // "{name='data',type='"NS"QImage',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("int", "{"PRE"value='42',numchild='0'}", "local.v");
+ next();
+ //run("QKeySequence", "{"PRE"value='("NS"QKeySequence)',numchild='1'",
+ // "local.v");
+ next();
+ run("QLine", "{"PRE"value='("NS"QLine)',numchild='1',children=["
+ "{name='data',type='"NS"QLine',value='{...}',numchild='2'}]}", "local.v");
+ next();
+ run("QLineF", "{"PRE"value='("NS"QLineF)',numchild='1',children=["
+ "{name='data',type='"NS"QLineF',value='{...}',numchild='2'}]}", "local.v");
+ next();
+ run("QVariantList", "{"PRE"value='("NS"QVariantList)',numchild='1',children=["
+ "{name='data',type='"NS"QList<"NS"QVariant>',"
+ "value='<0 items>',numchild='0'}]}", "local.v");
+ next();
+ run("QLocale", "{"PRE"value='("NS"QLocale)',numchild='1',children=["
+ "{name='data',type='"NS"QLocale',value='{...}',numchild='2'}]}", "local.v");
+ next();
+ run("qlonglong", "{"PRE"value='44',numchild='0'}", "local.v");
+ next();
+ run("QVariantMap", "{"PRE"value='("NS"QVariantMap)',numchild='1',children=["
+ "{name='data',type='"NS"QMap<"NS"QString, "NS"QVariant>',"
+ "value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QTransform", "{"PRE"value='("NS"QTransform)',numchild='1',children=["
+ // "{name='data',type='"NS"QTransform',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QMatrix4x4", "{"PRE"value='("NS"QMatrix4x4)',numchild='1',children=["
+ // "{name='data',type='"NS"QMatrix4x4',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QPalette", "{"PRE"value='("NS"QPalette)',numchild='1',children=["
+ // "{name='data',type='"NS"QPalette',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QPen", "{"PRE"value='("NS"QPen)',numchild='1',children=["
+ // "{name='data',type='"NS"QPen',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QPixmap", "{"PRE"value='("NS"QPixmap)',numchild='1',children=["
+ // "{name='data',type='"NS"QPixmap',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("QPoint", "{"PRE"value='("NS"QPoint)',numchild='1',children=["
+ "{name='data',type='"NS"QPoint',value='(45, 46)',numchild='2'}]}",
+ "local.v");
+ next();
+ //run("QPointArray", "{"PRE"value='("NS"QPointArray)',numchild='1',children=["
+ // "{name='data',type='"NS"QPointArray',value='{...}',numchild='1'}]}", "local.v");
+ next();
+// FIXME
+// run("QPointF", "{"PRE"value='("NS"QPointF)',numchild='1',children=["
+// "{name='data',type='"NS"QPointF',value='(41, 42)',numchild='2'}]}",
+// "local.v");
+ next();
+ //run("QPolygon", "{"PRE"value='("NS"QPolygon)',numchild='1',children=["
+ // "{name='data',type='"NS"QPolygon',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QQuaternion", "{"PRE"value='("NS"QQuaternion)',numchild='1',children=["
+ // "{name='data',type='"NS"QQuaternion',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("QRect", "{"PRE"value='("NS"QRect)',numchild='1',children=["
+ "{name='data',type='"NS"QRect',value='{...}',numchild='4'}]}", "local.v");
+ next();
+// FIXME:
+// run("QRectF", "{"PRE"value='("NS"QRectF)',numchild='1',children=["
+// "{name='data',type='"NS"QRectF',value='{...}',numchild='4'}]}", "local.v");
+ next();
+ run("QRegExp", "{"PRE"value='("NS"QRegExp)',numchild='1',children=["
+ "{name='data',type='"NS"QRegExp',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QRegion", "{"PRE"value='("NS"QRegion)',numchild='1',children=["
+ // "{name='data',type='"NS"QRegion',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("QSize", "{"PRE"value='("NS"QSize)',numchild='1',children=["
+ "{name='data',type='"NS"QSize',value='(0, 0)',numchild='2'}]}", "local.v");
+ next();
+
+// FIXME:
+// run("QSizeF", "{"PRE"value='("NS"QSizeF)',numchild='1',children=["
+// "{name='data',type='"NS"QSizeF',value='(0, 0)',numchild='2'}]}", "local.v");
+ next();
+ //run("QSizePolicy", "{"PRE"value='("NS"QSizePolicy)',numchild='1',children=["
+ // "{name='data',type='"NS"QSizePolicy',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("QString", "{"PRE"value='("NS"QString)',numchild='1',children=["
+ "{name='data',type='"NS"QString',valueencoded='7',value='610062006300',numchild='0'}]}",
+ "local.v");
+ next();
+ run("QStringList", "{"PRE"value='("NS"QStringList)',numchild='1',children=["
+ "{name='data',type='"NS"QStringList',value='<1 items>',numchild='1'}]}", "local.v");
+ next();
+ //run("QTextFormat", "{"PRE"value='("NS"QTextFormat)',numchild='1',children=["
+ // "{name='data',type='"NS"QTextFormat',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QTextLength", "{"PRE"value='("NS"QTextLength)',numchild='1',children=["
+ // "{name='data',type='"NS"QTextLength',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("QTime", "{"PRE"value='("NS"QTime)',numchild='1',children=["
+ "{name='data',type='"NS"QTime',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ run("uint", "{"PRE"value='43',numchild='0'}", "local.v");
+ next();
+ run("qulonglong", "{"PRE"value='45',numchild='0'}", "local.v");
+ next();
+ run("QUrl", "{"PRE"value='("NS"QUrl)',numchild='1',children=["
+ "{name='data',type='"NS"QUrl',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QVector2D", "{"PRE"value='("NS"QVector2D)',numchild='1',children=["
+ // "{name='data',type='"NS"QVector2D',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QVector3D", "{"PRE"value='("NS"QVector3D)',numchild='1',children=["
+ // "{name='data',type='"NS"QVector3D',value='{...}',numchild='1'}]}", "local.v");
+ next();
+ //run("QVector4D", "{"PRE"value='("NS"QVector4D)',numchild='1',children=["
+ // "{name='data',type='"NS"QVector4D',value='{...}',numchild='1'}]}", "local.v");
+}
+
+
///////////////////////////// QWeakPointer /////////////////////////////////
#if QT_VERSION >= 0x040500
@@ -2601,14 +2758,6 @@ void tst_Gdb::dump_QWeakPointer_2() {}
///////////////////////////// QHash<QString, QString> //////////////////////////////
-void dump_QHash_QString_QString()
-{
- /* A */ QHash<QString, QString> h;
- /* B */ h["hello"] = "world";
- /* C */ h["foo"] = "bar";
- /* D */ (void) 0;
-}
-
void dump_QHash_int_int()
{
/* A */ QHash<int, int> h;
@@ -2617,7 +2766,7 @@ void dump_QHash_int_int()
/* D */ (void) 0;
}
-void tst_Gdb::dump_QHash()
+void tst_Gdb::dump_QHash_int_int()
{
// Need to check the following combinations:
// int-key optimization, small value
@@ -2645,7 +2794,19 @@ void tst_Gdb::dump_QHash()
"{name='43',value='44'},"
"{name='45',value='46'}]}",
"local.h");
+}
+
+void dump_QHash_QString_QString()
+{
+ /* A */ QHash<QString, QString> h;
+ /* B */ h["hello"] = "world";
+ /* C */ h["foo"] = "bar";
+ /* D */ (void) 0;
+}
+
+void tst_Gdb::dump_QHash_QString_QString()
+{
prepare("dump_QHash_QString_QString");
if (checkUninitialized)
run("A","{iname='local.h',addr='-',name='h',"
@@ -2907,7 +3068,84 @@ void tst_Gdb::dump_QList_Int3()
"local.list,local.list.0");
}
-///////////////////////////// QVector /////////////////////////////////
+
+///////////////////////////// QPoint /////////////////////////////////
+
+void dump_QPoint()
+{
+ /* A */ QPoint p(43, 44);
+ /* B */ QPointF f(45, 46);
+ /* C */ (void) 0;
+}
+
+void tst_Gdb::dump_QPoint()
+{
+ prepare("dump_QPoint");
+ next();
+ next();
+ run("C","{iname='local.p',addr='-',name='p',type='"NS"QPoint',"
+ "value='(43, 44)',numchild='2',childtype='int',childnumchild='0',"
+ "children=[{name='x',value='43'},{name='y',value='44'}]},"
+ "{iname='local.f',addr='-',name='f',type='"NS"QPointF',"
+ "value='(45, 46)',numchild='2',childtype='double',childnumchild='0',"
+ "children=[{name='x',value='45'},{name='y',value='46'}]}",
+ "local.p,local.f");
+}
+
+
+///////////////////////////// QRect /////////////////////////////////
+
+void dump_QRect()
+{
+ /* A */ QRect p(43, 44, 100, 200);
+ /* B */ QRectF f(45, 46, 100, 200);
+ /* C */ (void) 0;
+}
+
+void tst_Gdb::dump_QRect()
+{
+ prepare("dump_QRect");
+ next();
+ next();
+
+return; // FIXME
+
+ run("C","{iname='local.p',addr='-',name='p',type='"NS"QRect',"
+ "value='(100x200+43+44)',numchild='4',childtype='int',childnumchild='0',"
+ "children=[{name='x1',value='43'},{name='y1',value='44'},"
+ "{name='x2',value='142'},{name='y2',value='243'}]},"
+ "{iname='local.f',addr='-',name='f',type='"NS"QRectF',"
+ "value='(45x46+100+200)',numchild='2',childtype='double',childnumchild='0',"
+ "children=[{name='x',value='45'},{name='y',value='46'}]}",
+ "local.p,local.f");
+}
+
+
+///////////////////////////// QSize /////////////////////////////////
+
+void dump_QSize()
+{
+ /* A */ QSize p(43, 44);
+ /* B */ QSizeF f(45, 46);
+ /* C */ (void) 0;
+}
+
+void tst_Gdb::dump_QSize()
+{
+ prepare("dump_QSize");
+ next();
+ next();
+ run("C","{iname='local.p',addr='-',name='p',type='"NS"QSize',"
+ "value='(43, 44)',numchild='2',childtype='int',childnumchild='0',"
+ "children=[{name='w',value='43'},{name='h',value='44'}]},"
+ "{iname='local.f',addr='-',name='f',type='"NS"QSizeF',"
+ "value='(45, 46)',numchild='2',childtype='double',childnumchild='0',"
+ "children=[{name='w',value='45'},{name='h',value='46'}]}",
+ "local.p,local.f");
+}
+
+
+///////////////////////////// QStack /////////////////////////////////
void dump_QStack()
{
@@ -3094,9 +3332,13 @@ int main(int argc, char *argv[])
dump_QList_Int3();
dump_QList_QString();
dump_QList_QString3();
+ dump_QPoint();
+ dump_QRect();
+ dump_QSize();
dump_QStack();
dump_QString();
dump_QStringList();
+ dump_QVariant();
dump_QVector();
dump_QWeakPointer_11();
dump_QWeakPointer_12();