diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index bc5efd68f110cf45029e86b4afe03fb86ad6ca2c..1fd417ac51318ba02ef5f393ce4ec08ce496eaf9 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -1974,7 +1974,15 @@
         \o Setting breakpoints in code that is compiled into the binary more
            than once does not work.
 
-           \endlist
+        \o On Linux and Windows, Installing Qt with one user account and
+        then using it with another requires other users to manually set
+        the Qt version. On Windows, setting the MinGW location is
+        required as well. The same applies to the location of GDB for Symbian.
+        A workaround is to copy %APPDATA%/Nokia/qtcreator.ini (Windows) or
+        $HOME/.config/Nokia/QtCreator.ini (Linux) from the directory
+        of the user who installed Creator to the other user.
+        This issues does not exist on Mac OS X.
+    \endlist
 
 
     \section1 Known Issues of Version 1.2.0 and 1.2.1
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index caa3800c81a641deb4f863d6e8b396c95db59dbf..0c3ca291a0748b4f1958ae804960668c282e2e41 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -350,7 +350,7 @@
 <context>
     <name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+702"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+704"/>
         <source>&amp;Change</source>
         <translation>&amp;Ändern</translation>
     </message>
@@ -358,7 +358,7 @@
 <context>
     <name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
     <message>
-        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+125"/>
+        <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+123"/>
         <source>CMake Wizard</source>
         <translation>CMake Assistent</translation>
     </message>
@@ -1052,7 +1052,7 @@
 <context>
     <name>CodePaster::CodepasterPlugin</name>
     <message>
-        <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+109"/>
+        <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+110"/>
         <source>&amp;Code Pasting</source>
         <translation>&amp;Code Pasting</translation>
     </message>
@@ -2583,7 +2583,7 @@ Sollen sie überschrieben werden?</translation>
 <context>
     <name>CppTools::Internal::CppFindReferences</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+238"/>
+        <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+239"/>
         <source>Searching...</source>
         <translation>Suche...</translation>
     </message>
@@ -2599,7 +2599,7 @@ Sollen sie überschrieben werden?</translation>
 <context>
     <name>CppTools::Internal::CppModelManager</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+295"/>
+        <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+319"/>
         <source>Scanning</source>
         <translation>Suche</translation>
     </message>
@@ -2633,7 +2633,7 @@ Sollen sie überschrieben werden?</translation>
 <context>
     <name>CppTools::Internal::FunctionArgumentWidget</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+434"/>
+        <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+443"/>
         <source>%1 of %2</source>
         <translation>%1 von %2</translation>
     </message>
@@ -2680,18 +2680,18 @@ Sollen sie überschrieben werden?</translation>
 <context>
     <name>Debugger::DebuggerManager</name>
     <message>
-        <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+451"/>
+        <location filename="../../../src/plugins/debugger/debuggermanager.cpp" line="+454"/>
         <source>Continue</source>
         <translation>Fortsetzen</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+1207"/>
+        <location line="+1215"/>
         <source>Interrupt</source>
         <translation>Anhalten</translation>
     </message>
     <message>
-        <location line="-1204"/>
+        <location line="-1212"/>
         <source>Reset Debugger</source>
         <translation>Debugger zurücksetzen</translation>
     </message>
@@ -2767,7 +2767,7 @@ Sollen sie überschrieben werden?</translation>
         <translation>Diese Anwendung erfordert den Debugger &apos;%1&apos;, der gegenwärtig deaktiviert ist.</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+125"/>
         <source>Starting debugger for tool chain &apos;%1&apos;...</source>
         <translation>Starte Debugger für Toolchain &apos;%1&apos;...</translation>
     </message>
@@ -2822,7 +2822,7 @@ Sollen sie überschrieben werden?</translation>
         <translation>Ausgabe-Hilfsbibliothek nicht gefunden</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+172"/>
         <source>Stop Debugger</source>
         <translation>Debugger anhalten</translation>
     </message>
@@ -3764,7 +3764,7 @@ Sollen sie überschrieben werden?</translation>
 <context>
     <name>Debugger::Internal::GdbEngine</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+293"/>
+        <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+304"/>
         <source>The Gdb process failed to start. Either the invoked program &apos;%1&apos; is missing, or you may have insufficient permissions to invoke the program.</source>
         <translation>Der Start des Gdb-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei &apos;%1&apos; oder die Berechtigungen sind nicht ausreichend.</translation>
     </message>
@@ -3824,17 +3824,17 @@ Sollen sie überschrieben werden?</translation>
         <translation>Thread %1 ausgewählt.</translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+297"/>
         <source>Stopping temporarily.</source>
         <translation>Temporär Anhalten.</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+88"/>
         <source>Process failed to start.</source>
         <translation>Der Prozess konnte nicht gestartet werden.</translation>
     </message>
     <message>
-        <location line="+387"/>
+        <location line="+417"/>
         <source>&lt;p&gt;The inferior stopped because it received a signal from the Operating System.&lt;p&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;Signal name : &lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Signal meaning : &lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation>&lt;p&gt;Der Prozess wurde nach Erhalt eines Signals vom Betriebssystem angehalten.&lt;p&gt;&lt;table&gt;&lt;tr&gt;&lt;td&gt;Name des Signals : &lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Bedeutung : &lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
@@ -3850,17 +3850,17 @@ Sollen sie überschrieben werden?</translation>
         <translation>Signal erhalten</translation>
     </message>
     <message>
-        <location line="-671"/>
+        <location line="-763"/>
         <source>Reading %1...</source>
         <translation>Lese %1...</translation>
     </message>
     <message>
-        <location line="+415"/>
+        <location line="+504"/>
         <source>Jumped. Stopped.</source>
         <translation>Sprung ausgeführt/ Angehalten.</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+164"/>
         <source>Loading %1...</source>
         <translation>Lade %1...</translation>
     </message>
@@ -3889,13 +3889,13 @@ Das Debuggen wird wahrscheinlich nicht richtig funktionieren.
 Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-560"/>
         <source>Processing queued commands.</source>
         <translation>Kommando-Warteschlange wird abgearbeitet.</translation>
     </message>
     <message>
-        <location line="+154"/>
-        <location line="+101"/>
+        <location line="+504"/>
+        <location line="+109"/>
         <source>Stopped.</source>
         <translation>Angehalten.</translation>
     </message>
@@ -3912,17 +3912,17 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
 </translation>
     </message>
     <message>
-        <location line="+2505"/>
+        <location line="+2484"/>
         <source>The debugging helper library was not found at %1.</source>
         <translation>Die Ausgabe-Hilfsbibliothek konnte nicht unter %1 gefunden werden.</translation>
     </message>
     <message>
-        <location line="+335"/>
+        <location line="+369"/>
         <source>Unable to start gdb &apos;%1&apos;: %2</source>
         <translation>Der gdb-Debugger &apos;%1&apos; kann nicht ausgeführt werden: %2</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+90"/>
         <source>Cannot find debugger initialization script</source>
         <translation>Das Initalisierungsskript konnte nicht gefunden werden</translation>
     </message>
@@ -3932,7 +3932,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>Auf die in den Debugger-Einstellungen angegebene Skriptdatei &apos;%1&apos; kann nicht zugegriffen werden. Wenn kein Skript benötigt wird, können Sie die Einstellung rücksetzen, um diese Warnung zu umgehen.</translation>
     </message>
     <message>
-        <location line="-2138"/>
+        <location line="-2155"/>
         <source>Unable to run &apos;%1&apos;: %2</source>
         <translation>&apos;%1&apos; kann nicht ausgeführt werden: %2</translation>
     </message>
@@ -3949,7 +3949,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>Daten der Stack-Anzeige werden empfangen...</translation>
     </message>
     <message numerus="yes">
-        <location line="+495"/>
+        <location line="+503"/>
         <source>Retrieving data for watch view (%n requests pending)...</source>
         <translation>
             <numerusform>Daten der für die Anzeige der lokalen Variablen werden empfangen (noch eine austehende Anfrage) ...</numerusform>
@@ -3957,7 +3957,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+633"/>
+        <location line="+623"/>
         <source>&lt;%n items&gt;</source>
         <extracomment>In string list</extracomment>
         <translation>
@@ -3966,7 +3966,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         </translation>
     </message>
     <message>
-        <location line="-309"/>
+        <location line="-299"/>
         <source>Finished retrieving data.</source>
         <translation>Alle Daten erhalten.</translation>
     </message>
@@ -3984,7 +3984,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         </translation>
     </message>
     <message>
-        <location line="-2752"/>
+        <location line="-2855"/>
         <source>An unknown error in the Gdb process occurred. </source>
         <translation>Im Gdb-Prozess trat ein unbekannter Fehler auf.</translation>
     </message>
@@ -3994,23 +3994,25 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>Läuft...</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+97"/>
         <source>Stop requested...</source>
         <translation>Stop angefordert...</translation>
     </message>
     <message>
-        <location line="+141"/>
-        <location line="+16"/>
+        <location line="+197"/>
+        <location line="+29"/>
+        <location line="+3"/>
         <source>Executable failed</source>
         <translation>Fehler bei Ausführung</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-7"/>
+        <location line="+8"/>
         <source>Executable failed: %1</source>
         <translation>Fehler bei Ausführung: %1</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+227"/>
         <source>Program exited with exit code %1.</source>
         <translation>Das Programm wurde beendet, Rückgabewert %1.</translation>
     </message>
@@ -4025,7 +4027,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>Das Programm wurde normal beendet.</translation>
     </message>
     <message>
-        <location line="+482"/>
+        <location line="+483"/>
         <source>Continuing after temporary stop...</source>
         <translation>Setze nach temporärem Anhalten fort...</translation>
     </message>
@@ -4070,12 +4072,12 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>Ausführung bis Funktion %1 angefordert...</translation>
     </message>
     <message>
-        <location line="+706"/>
+        <location line="+708"/>
         <source>Jumping out of bogus frame...</source>
         <translation>Verlasse ungültigen Stack-Frame...</translation>
     </message>
     <message>
-        <location line="+907"/>
+        <location line="+903"/>
         <source>Custom dumper setup: %1</source>
         <translation>Ausgabe-Hilfsbibliothek-Initialisierung: %1</translation>
     </message>
@@ -4090,7 +4092,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>&lt;überlagert&gt;</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+134"/>
         <source>&lt;n/a&gt;</source>
         <translation>&lt;k.a.&gt;</translation>
     </message>
@@ -4106,14 +4108,14 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>&lt;keine Angabe&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+349"/>
         <location line="+25"/>
         <location line="+14"/>
         <source>Disassembler failed: %1</source>
         <translation>Fehler beim Disassemblieren: %1</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+155"/>
         <source>Gdb I/O Error</source>
         <translation>Gdb Ein/Ausgabefehler</translation>
     </message>
@@ -4158,12 +4160,12 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>Der Start des zu debuggenden Prozesses schlug fehl</translation>
     </message>
     <message>
-        <location line="-2938"/>
+        <location line="-2963"/>
         <source>Inferior shutdown failed</source>
         <translation>Das Beenden des zu debuggenden Prozesses schlug fehl</translation>
     </message>
     <message>
-        <location line="+2958"/>
+        <location line="+2983"/>
         <source>Adapter crashed</source>
         <translation>Der Adapter ist abgestürzt</translation>
     </message>
@@ -4321,7 +4323,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
 <context>
     <name>Debugger::Internal::PlainGdbAdapter</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+70"/>
+        <location filename="../../../src/plugins/debugger/gdb/plaingdbadapter.cpp" line="+79"/>
         <source>Cannot set up communication with child process: %1</source>
         <translation>Die Kommunikation mit dem untergeordneten Prozesss konnte nicht hergestellt werden: %1</translation>
     </message>
@@ -4402,7 +4404,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
 <context>
     <name>Debugger::Internal::RemoteGdbAdapter</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+93"/>
+        <location filename="../../../src/plugins/debugger/gdb/remotegdbadapter.cpp" line="+112"/>
         <source>The upload process failed to start. Shell missing?</source>
         <translation>Das Hochladen schlug fehl. Eine mögliche Ursache könnte ein fehlendes Shell-Programm sein.</translation>
     </message>
@@ -4504,7 +4506,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
 <context>
     <name>Debugger::Internal::StackHandler</name>
     <message>
-        <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+142"/>
+        <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+143"/>
         <source>...</source>
         <translation></translation>
     </message>
@@ -4583,7 +4585,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>Stack</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+41"/>
         <source>Copy contents to clipboard</source>
         <translation>Inhalt in Zwischenablage kopieren</translation>
     </message>
@@ -4713,7 +4715,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>Der Prozess wurde gestartet, PID: 0x%1, Thread-Id: 0x%2, Code-Segment: 0x%3, Datensegment: 0x%4.</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>Connecting to TRK server adapter failed:
 </source>
         <translation>Die Verbindung zum TRK-Server-Adapter schlug fehl:
@@ -4766,7 +4768,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
 <context>
     <name>Debugger::Internal::WatchData</name>
     <message>
-        <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+71"/>
+        <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+72"/>
         <location line="+250"/>
         <source>&lt;not in scope&gt;</source>
         <translation>&lt;nicht im Bereich&gt;</translation>
@@ -4805,12 +4807,12 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
         <translation>Interner Name</translation>
     </message>
     <message>
-        <location line="+1116"/>
+        <location line="+1122"/>
         <source>&lt;Edit&gt;</source>
         <translation>&lt;Editieren&gt;</translation>
     </message>
     <message>
-        <location line="-1084"/>
+        <location line="-1090"/>
         <source>Root</source>
         <translation>Wurzelelement</translation>
     </message>
@@ -4848,7 +4850,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
 <context>
     <name>Debugger::Internal::WatchModel</name>
     <message>
-        <location line="+447"/>
+        <location line="+453"/>
         <source>decimal</source>
         <translation>dezimal</translation>
     </message>
@@ -5110,7 +5112,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
 <context>
     <name>Designer::Internal::FormClassWizardPage</name>
     <message>
-        <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+148"/>
+        <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+149"/>
         <source>%1 - Error</source>
         <translation>%1 - Fehler</translation>
     </message>
@@ -5653,7 +5655,7 @@ Grund: %3</translation>
 <context>
     <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
-        <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+944"/>
+        <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+939"/>
         <source>Not implemented in FakeVim</source>
         <translation>In FakeVim nicht implementiert</translation>
     </message>
@@ -6075,7 +6077,7 @@ Grund: %3</translation>
         <translation>Suchergebnisse</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+67"/>
+        <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+68"/>
         <source>No matches found!</source>
         <translation>Es wurden keine Treffer gefunden!</translation>
     </message>
@@ -6529,6 +6531,7 @@ Grund: %3</translation>
     <message>
         <location filename="../../../src/plugins/git/gitclient.cpp" line="+71"/>
         <source>Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work.</source>
+        <translatorcomment>Not used.</translatorcomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9206,6 +9209,7 @@ Fehler: %2</translation>
 <context>
     <name>ProjectExplorer::Internal::ActiveConfigurationWidget</name>
     <message>
+        <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+2181"/>
         <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+181"/>
         <source>Active run configuration</source>
         <translation>Aktive Ausführungskonfiguration</translation>
@@ -9776,7 +9780,7 @@ Fehler: %2</translation>
 <context>
     <name>ProjectExplorer::Internal::ProjectWelcomePage</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+47"/>
+        <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+48"/>
         <source>Develop</source>
         <translation>Entwicklung</translation>
     </message>
@@ -9833,7 +9837,7 @@ Fehler: %2</translation>
     </message>
     <message>
         <location line="-38"/>
-        <location line="+105"/>
+        <location line="+110"/>
         <source>Active Build and Run Configurations</source>
         <translation>Aktive Build- und Ausführungskonfigurationen</translation>
     </message>
@@ -9913,7 +9917,7 @@ Fehler: %2</translation>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+138"/>
         <source>&lt;a href=&quot;#&quot;&gt;Make %1 active.&lt;/a&gt;</source>
         <translation>&lt;a href=&quot;#&quot;&gt;Setze %1 aktiv.&lt;/a&gt;</translation>
     </message>
@@ -9995,12 +9999,12 @@ Fehler: %2</translation>
 <context>
     <name>ProjectExplorer::Internal::WinGuiProcess</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+122"/>
+        <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+125"/>
         <source>The process could not be started!</source>
         <translation>Der Prozess konnte nicht gestartet werden!</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Cannot retrieve debugging output!</source>
         <translation>Es konnte keine Debugausgabe erhalten werden!</translation>
     </message>
@@ -10044,7 +10048,7 @@ Fehler: %2</translation>
 <context>
     <name>ProjectExplorer::ProjectExplorerPlugin</name>
     <message>
-        <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+257"/>
+        <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="-1923"/>
         <source>Projects</source>
         <translation>Projekte</translation>
     </message>
@@ -10277,7 +10281,7 @@ Fehler: %2</translation>
         <translation>Bereinigen unter Ausschluss der Abhängigkeiten</translation>
     </message>
     <message>
-        <location line="+1181"/>
+        <location line="+1185"/>
         <source>New File</source>
         <comment>Title of dialog</comment>
         <translation>Neue Datei</translation>
@@ -10336,7 +10340,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
         <translation>Windows Explorer konnte nicht gestartet werden, da die Datei explorer.exe nicht im Pfad gefunden werden konnte.</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+18"/>
         <source>Launching a file explorer failed</source>
         <translation>Das Starten des Datei-Browsers schlug fehl</translation>
     </message>
@@ -10399,12 +10403,12 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
         <translation>Die aktive Build-Konfiguration erstellt ein Ziel, das von der aktiven Ausführungskonfiguration nicht verwendet werden kann.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+29"/>
         <source>Choose build configuration:</source>
         <translation>Build-Konfiguration wählen:</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="-9"/>
         <source>No valid build configuration found.</source>
         <translation>Es konnte keine gültige Build-Konfiguration gefunden werden.</translation>
     </message>
@@ -10716,19 +10720,19 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
     <name>QmlProjectManager::Internal::QmlRunConfiguration</name>
     <message>
         <location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+339"/>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>QML Viewer</source>
         <translation>QML-Betrachter</translation>
     </message>
     <message>
         <location line="-31"/>
         <location line="+40"/>
-        <location line="+60"/>
+        <location line="+46"/>
         <source>&lt;Current File&gt;</source>
         <translation>&lt;Aktuelle Datei&gt;</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-54"/>
         <source>QML Viewer arguments:</source>
         <translation>Kommandozeilenargumente für QML-Betrachter:</translation>
     </message>
@@ -11220,23 +11224,23 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
         <location line="-5"/>
         <source>Alt</source>
         <comment>Shortcut key</comment>
-        <translation>Alt-Taste</translation>
+        <translation>Alt</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Ctrl</source>
         <comment>Shortcut key</comment>
-        <translation>Ctrl</translation>
+        <translation>Strg</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You can switch between Qt Creator&apos;s modes using &lt;tt&gt;Ctrl+number&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Welcome&lt;/li&gt;&lt;li&gt;2 - Edit&lt;/li&gt;&lt;li&gt;3 - Debug&lt;/li&gt;&lt;li&gt;4 - Projects&lt;/li&gt;&lt;li&gt;5 - Help&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Output&lt;/li&gt;&lt;/ul&gt;</source>
-        <translation>Sie können zwischen den Modi von Qt Crator umschalten, indem Sie &lt;tt&gt;Ctrl+Nummber&lt;/tt&gt; verwenden: &lt;ul&gt;&lt;li&gt;1 - Willkommen&lt;/li&gt;&lt;li&gt;2 - Editieren&lt;/li&gt;&lt;li&gt;3 - Debuggen&lt;/li&gt;&lt;li&gt;4 - Projekte&lt;/li&gt;&lt;li&gt;5 - Hilfe&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Ausgabe&lt;/li&gt;&lt;/ul&gt;</translation>
+        <translation> Sie können mit &lt;tt&gt;Strg+Nummer&lt;/tt&gt; zwischen den Modi von Qt Creator umschalten: &lt;ul&gt;&lt;li&gt;1 - Willkommen&lt;/li&gt;&lt;li&gt;2 - Editieren&lt;/li&gt;&lt;li&gt;3 - Debuggen&lt;/li&gt;&lt;li&gt;4 - Projekte&lt;/li&gt;&lt;li&gt;5 - Hilfe&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Ausgabe&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You can show and hide the side bar using &lt;tt&gt;%1+0&lt;tt&gt;.</source>
-        <translation>Sie können die Seitenleiste mit &lt;tt&gt;%1+0&lt;tt&gt; anzeigen oder zuklappen.</translation>
+        <translation>Sie können die Seitenleiste mit &lt;tt&gt;%1+0&lt;/tt&gt; anzeigen oder zuklappen.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11246,12 +11250,12 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
     <message>
         <location line="+2"/>
         <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation>Wenn Sie eine &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;externe Bibliothek&lt;/a&gt;, hinzufügen, bietet Qt Creator automatisch Syntax-Hervorhebung und Code-Vervollständigung.</translation>
+        <translation>Wenn Sie eine &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;externe Bibliothek&lt;/a&gt; hinzufügen, bietet Qt Creator automatisch Syntax-Hervorhebung und Code-Vervollständigung.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation>Die Code-Vervollständigung versteht CamelCase. Sie können zum Beipiel statt &lt;tt&gt;namespaceUri&lt;/tt&gt; einfach &lt;tt&gt;nU&lt;/tt&gt; schreiben und danach &lt;tt&gt;Strg+Leertaste&lt;/tt&gt; drucken.</translation>
+        <translation>Die Code-Vervollständigung versteht CamelCase. Sie können zum Beipiel statt &lt;tt&gt;namespaceUri&lt;/tt&gt; einfach &lt;tt&gt;nU&lt;/tt&gt; schreiben und danach &lt;tt&gt;Strg+Leertaste&lt;/tt&gt; drücken.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11271,12 +11275,12 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
     <message>
         <location line="+2"/>
         <source>You can switch between the output pane by hitting &lt;tt&gt;%1+n&lt;/tt&gt; where n is the number denoted on the buttons at the window bottom:&lt;ul&gt;&lt;li&gt;1 - Build Issues&lt;/li&gt;&lt;li&gt;2 - Search Results&lt;/li&gt;&lt;li&gt;3 - Application Output&lt;/li&gt;&lt;li&gt;4 - Compile Output&lt;/li&gt;&lt;/ul&gt;</source>
-        <translation>Sie können ywischen den Ausgabepanelen umschalten, in dem Sie &lt;tt&gt;%1+n&lt;/tt&gt; drücken, wobei n die Zahl ist, die auf den Schaltflächen am unteren Fensterrand befindet: &lt;ul&gt;&lt;li&gt;1 - Build-Probleme&lt;/li&gt;&lt;li&gt;2 - Suchergebnisse&lt;/li&gt;&lt;li&gt;3 - Ausgabe der Anwendung&lt;/li&gt;&lt;li&gt;4 - Kompilierung&lt;/li&gt;&lt;/ul&gt;</translation>
+        <translation>Sie können zwischen den Ausgabepanelen umschalten, in dem Sie &lt;tt&gt;%1+n&lt;/tt&gt; drücken, wobei n die Zahl ist, die auf den Schaltflächen am unteren Fensterrand befindet: &lt;ul&gt;&lt;li&gt;1 - Build-Probleme&lt;/li&gt;&lt;li&gt;2 - Suchergebnisse&lt;/li&gt;&lt;li&gt;3 - Ausgabe der Anwendung&lt;/li&gt;&lt;li&gt;4 - Kompilierung&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation>Mit der &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;) können Sie schnell nach Methoden, Klassen, Hilfe und anderem suchen.</translation>
+        <translation type="unfinished">Mit der &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator-Leiste&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;) können Sie schnell nach Methoden, Klassen, Hilfe und anderem suchen.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11294,12 +11298,11 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
         <translation>Sie können ihre Encoding-Vorgabe für den Editor für jedes Projekt in &lt;tt&gt;Projekte -&gt; Editoreinstellungen -&gt; Encoding-Vorgabe&lt;/tt&gt; einstellen.</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>You can modify the binary that is being executed when you press the &lt;tt&gt;Run&lt;/tt&gt; button: Add a &lt;tt&gt;Custom Executable&lt;/tt&gt; by clicking the &lt;tt&gt;+&lt;/tt&gt; button in &lt;tt&gt;Projects -&gt; Run Settings -&gt; Run Configuration&lt;/tt&gt; and then select the new target in the combo box.</source>
-        <translation>Sie können die auszuführende Datei bestimmen die ausgeführt wird, wenn Sie auf die &lt;tt&gt;Ausführen&lt;/tt&gt;-Schaltlfläche klicken: Fügen Sie dazu eine &lt;tt&gt;Benutzerdefinierte ausführbare Datei&lt;/tt&gt; unter  &lt;tt&gt;Projekte -&gt;Ausführung -&gt; Ausführungskonfiguration&lt;/tt&gt; hinzu, indem Sie auf die &lt;tt&gt;+&lt;/tt&gt;-Schaltfläche klicken und wählen Sie die neue Konfiguration aus der Auswahl.</translation>
+        <translation type="obsolete">Sie können die Datei bestimmen, die bei Klick auf die Schaltfläche &lt;tt&gt;Ausführen&lt;/tt&gt; gestartet wird: Fügen Sie dazu eine &lt;tt&gt;Benutzerdefinierte ausführbare Datei&lt;/tt&gt; unter &lt;tt&gt;Projekte -&gt;Ausführung -&gt; Ausführungskonfiguration&lt;/tt&gt; hinzu, indem Sie auf die &lt;tt&gt;+&lt;/tt&gt;-Schaltfläche klicken und die neue Konfiguration auswählen.</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+1"/>
         <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
         <translation>Sie können Qt Creator mit einer Reihe von  &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;Revisionskontrollsystemen&lt;/a&gt; wie Subversion, Perforce, CVS oder Git verwenden.</translation>
     </message>
@@ -11558,7 +11561,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
 <context>
     <name>Qt4ProjectManager::Internal::QMakeStepFactory</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+336"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+346"/>
         <source>QMake</source>
         <translation>QMake</translation>
     </message>
@@ -11926,8 +11929,8 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
-        <translation>MinGw-Verzeichnis:</translation>
+        <source>MinGW Directory:</source>
+        <translation>MinGW-Verzeichnis:</translation>
     </message>
     <message>
         <location/>
@@ -12529,7 +12532,7 @@ Installiere Anwendung auf &apos;%2&apos;...</translation>
 <context>
     <name>Qt4ProjectManager::QMakeStep</name>
     <message>
-        <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="-232"/>
+        <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="-242"/>
         <source>
 &lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;No valid Qt version set. Set one in Preferences &lt;/b&gt;&lt;/font&gt;
 </source>
@@ -12555,7 +12558,7 @@ Installiere Anwendung auf &apos;%2&apos;...</translation>
 <context>
     <name>Qt4ProjectManager::QMakeStepConfigWidget</name>
     <message>
-        <location line="+78"/>
+        <location line="+88"/>
         <source>&lt;b&gt;QMake:&lt;/b&gt; No Qt version set. QMake can not be run.</source>
         <translation>&lt;b&gt;QMake:&lt;/b&gt; Es ist keine Qt-Version gesetzt. QMake kann nicht ausgeführt werden.</translation>
     </message>
@@ -12651,7 +12654,7 @@ Installiere Anwendung auf &apos;%2&apos;...</translation>
         <translation>Qt aus PATH</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+144"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
@@ -13911,7 +13914,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt  von einem Leerzeich
     <name>TextEditor::BaseFileFind</name>
     <message>
         <location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+119"/>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>%1 found</source>
         <translation>%1 gefunden</translation>
     </message>
@@ -13942,7 +13945,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt  von einem Leerzeich
 <context>
     <name>TextEditor::BaseTextEditor</name>
     <message>
-        <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+252"/>
+        <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+254"/>
         <source>Print Document</source>
         <translation>Dokument drucken</translation>
     </message>
@@ -13960,7 +13963,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt  von einem Leerzeich
 <context>
     <name>TextEditor::BaseTextEditorEditable</name>
     <message>
-        <location line="+4275"/>
+        <location line="+4311"/>
         <source>Line: %1, Col: %2</source>
         <translation>Zeile: %1, Spalte: %2</translation>
     </message>
@@ -14819,12 +14822,11 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
         <translation>Intel C++-Compiler (Linux)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>MinGW</source>
-        <translation>MinGW</translation>
+        <translation type="obsolete">MinGW</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>Microsoft Visual C++</source>
         <translation>Microsoft Visual C++</translation>
     </message>
@@ -15057,7 +15059,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
 <context>
     <name>Utils::NewClassWidget</name>
     <message>
-        <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+416"/>
+        <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+417"/>
         <source>Invalid base class name</source>
         <translation>Der Name der Basisklasse ist ungültig</translation>
     </message>
@@ -15116,6 +15118,21 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
         <source>Inherits QObject</source>
         <translation>Erbt von Klasse QObject</translation>
     </message>
+    <message>
+        <location/>
+        <source>Type information:</source>
+        <translation>Typinformation:</translation>
+    </message>
+    <message>
+        <location/>
+        <source>None</source>
+        <translation>Keine</translation>
+    </message>
+    <message>
+        <location/>
+        <source>Inherits QWidget</source>
+        <translation>Erbt von Klasse QWidget</translation>
+    </message>
 </context>
 <context>
     <name>Utils::PathChooser</name>
@@ -15361,7 +15378,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
         <translation>Checkout begonnen...</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+13"/>
         <source>Failed.</source>
         <translation>Fehlgeschlagen.</translation>
     </message>
@@ -15402,7 +15419,12 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
 <context>
     <name>VCSBase::ProcessCheckoutJob</name>
     <message>
-        <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+109"/>
+        <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+101"/>
+        <source>Unable to start %1: %2</source>
+        <translation>%1 kann nicht gestartet werden: %2</translation>
+    </message>
+    <message>
+        <location line="+15"/>
         <source>The process terminated with exit code %1.</source>
         <translation>Der Prozess wurde beendet, Rückgabewert %1.</translation>
     </message>
@@ -15808,7 +15830,7 @@ Qt Centre</translation>
 <context>
     <name>Debugger::Internal::TermGdbAdapter</name>
     <message>
-        <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+142"/>
+        <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+176"/>
         <source>Debugger Error</source>
         <translation>Debugger-Fehler</translation>
     </message>
@@ -15992,4 +16014,46 @@ Qt Centre</translation>
         <translation>%1: Verbindung im Versuch %2 fehlgeschlagen: %3 (wird wiederholt)...</translation>
     </message>
 </context>
+<context>
+    <name>trk::Session</name>
+    <message>
+        <location filename="../../../src/shared/trk/trkutils.cpp" line="+79"/>
+        <source>CPU: v%1.%2%3%4</source>
+        <extracomment>CPU description of an S60 device %1 major verison, %2 minor version %3 real name of major verison, %4 real name of minor version</extracomment>
+        <translation>CPU: v%1.%2%3%4</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>App TRK: v%1.%2 TRK protocol: v%3.%4</source>
+        <translation>App TRK: v%1.%2 TRK-Protokoll: v%3.%4</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>%1, %2%3%4, %5</source>
+        <extracomment>s60description description of an S60 device %1 CPU description, %2 endianness %3 default type size (if any), %4 float size (if any) %5 TRK version</extracomment>
+        <translation>%1, %2%3%4, %5</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>big endian</source>
+        <translation>big endian</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>little endian</source>
+        <translation>little endian</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>, type size: %1</source>
+        <extracomment>will be inserted into s60description</extracomment>
+        <translation>, Typgröße: %1</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>, float size: %1</source>
+        <extracomment>will be inserted into s60description</extracomment>
+        <translation>, Gleitkomma-Größe: %1</translation>
+    </message>
+</context>
 </TS>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index d8b324365138bee6812c1e675d25790702fcc256..06a78c52d7c9076905ffb2e037e7e74a1bc37e1e 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -11067,8 +11067,8 @@ al control de versiones (%2)?</translation>
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
-        <translation>Directorio de MinGw:</translation>
+        <source>MinGW Directory:</source>
+        <translation>Directorio de MinGW:</translation>
     </message>
     <message>
         <location/>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 60d3782051b807288a630dc8b5d3baa9e47b9a75..9144b67c1e46cc27e24eaa61569ca205dd30eb74 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -10356,7 +10356,7 @@ to version control (%2)?</source>
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
+        <source>MinGW Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 9448a8bbabf098461a9420459df505f421e510a9..6e9d07812127f2d008a648dbdad600b7e3b76371 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -11037,8 +11037,8 @@ al VCS (%2)?</translation>
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
-        <translation>Cartella MinGw:</translation>
+        <source>MinGW Directory:</source>
+        <translation>Cartella MinGW:</translation>
     </message>
     <message>
         <location/>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 504eecda75487ef1d847ca8193ca5d10dcc5afa6..8500b11a9ddcdb4398e4c5dd1b2977fa9bcdd80c 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -11041,8 +11041,8 @@ to version control (%2)?</source>
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
-        <translation>MinGw ディレクトリ:</translation>
+        <source>MinGW Directory:</source>
+        <translation>MinGW ディレクトリ:</translation>
     </message>
     <message>
         <location/>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 327192d7a8dd55d26fbd369f3e952fc4472b04cd..f45b49cf79d3b023cfc9ff4d9e4ebe3b93d2ff0c 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -2803,7 +2803,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
+        <source>MinGW Directory:</source>
         <translation>Katalog MinGW:</translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 4f9df2aac00d69ab520521b405348860870a07c2..f90641eda278fcbb4bf1011f71a4f67a0a2371d4 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -12389,8 +12389,8 @@ to version control (%2)?</source>
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
-        <translation>Каталог MinGw:</translation>
+        <source>MinGW Directory:</source>
+        <translation>Каталог MinGW:</translation>
     </message>
     <message>
         <location/>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index 46217312b619ffc010dd2d6270b13e3c625c2e7a..196b3d464117d581b8b63aeedb48fe24f98ce520 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -10770,7 +10770,7 @@ v sistem za nadzor različic (%2)?</translation>
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
+        <source>MinGW Directory:</source>
         <translation>Mapa z MinGW:</translation>
     </message>
     <message>
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index 3f1b1aff944031eb3d0578481389d22ed315136f..b05525b8547fbc367ec9d01bb896b3feec851769 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -147,6 +147,16 @@ void Document::setRevision(unsigned revision)
     _revision = revision;
 }
 
+QDateTime Document::lastModified() const
+{
+    return _lastModified;
+}
+
+void Document::setLastModified(const QDateTime &lastModified)
+{
+    _lastModified = lastModified;
+}
+
 QString Document::fileName() const
 {
     return _fileName;
@@ -447,6 +457,8 @@ Document::Ptr Snapshot::documentFromSource(const QByteArray &preprocessedCode,
     Document::Ptr newDoc = Document::create(fileName);
 
     if (Document::Ptr thisDocument = value(fileName)) {
+        newDoc->_revision = thisDocument->_revision;
+        newDoc->_lastModified = thisDocument->_lastModified;
         newDoc->_includes = thisDocument->_includes;
         newDoc->_definedMacros = thisDocument->_definedMacros;
         newDoc->_macroUses = thisDocument->_macroUses;
diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index 6a9896a531798af133598319ed033422fb5a022c..596bee794b33aec14a1145ffbeea3d08cd7551d4 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -40,6 +40,7 @@
 #include <QSharedPointer>
 #include <QString>
 #include <QStringList>
+#include <QDateTime>
 
 namespace CPlusPlus {
 
@@ -63,6 +64,9 @@ public:
     unsigned revision() const;
     void setRevision(unsigned revision);
 
+    QDateTime lastModified() const;
+    void setLastModified(const QDateTime &lastModified);
+
     QString fileName() const;
 
     QStringList includedFiles() const;
@@ -310,6 +314,7 @@ private:
     QList<MacroUse> _macroUses;
     QList<UndefinedMacroUse> _undefinedMacroUses;
     QByteArray _source;
+    QDateTime _lastModified;
     unsigned _revision;
 
     friend class Snapshot;
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index dcec76f36735a6532bb6267b303f73be42c823fd..53a471bae0a6d5131f35df071abb3bd141195d5a 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -81,6 +81,7 @@
 #include <QtCore/QTime>
 #include <QtCore/QTimer>
 #include <QtCore/QStack>
+#include <QtCore/QSettings>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QHeaderView>
@@ -765,8 +766,32 @@ void CPPEditor::renameUsages()
     renameUsagesNow();
 }
 
+bool CPPEditor::showWarningMessage() const
+{
+    // Restore settings
+    QSettings *settings = Core::ICore::instance()->settings();
+    settings->beginGroup(QLatin1String("CppEditor"));
+    settings->beginGroup(QLatin1String("Rename"));
+    const bool showWarningMessage = settings->value(QLatin1String("ShowWarningMessage"), true).toBool();
+    settings->endGroup();
+    settings->endGroup();
+    return showWarningMessage;
+}
+
+void CPPEditor::setShowWarningMessage(bool showWarningMessage)
+{
+    // Restore settings
+    QSettings *settings = Core::ICore::instance()->settings();
+    settings->beginGroup(QLatin1String("CppEditor"));
+    settings->beginGroup(QLatin1String("Rename"));
+    settings->setValue(QLatin1String("ShowWarningMessage"), showWarningMessage);
+    settings->endGroup();
+    settings->endGroup();
+}
+
 void CPPEditor::hideRenameNotification()
 {
+    setShowWarningMessage(false);
     Core::EditorManager::instance()->hideEditorInfoBar(QLatin1String("CppEditor.Rename"));
 }
 
@@ -774,10 +799,12 @@ void CPPEditor::renameUsagesNow()
 {
     if (Symbol *canonicalSymbol = markSymbols()) {
         if (canonicalSymbol->identifier() != 0) {
-            Core::EditorManager::instance()->showEditorInfoBar(QLatin1String("CppEditor.Rename"),
-                                                               tr("This change cannot be undone."),
-                                                               tr("Yes, I know what I am doing."),
-                                                               this, SLOT(hideRenameNotification()));
+            if (showWarningMessage()) {
+                Core::EditorManager::instance()->showEditorInfoBar(QLatin1String("CppEditor.Rename"),
+                                                                   tr("This change cannot be undone."),
+                                                                   tr("Yes, I know what I am doing."),
+                                                                   this, SLOT(hideRenameNotification()));
+            }
 
             m_modelManager->renameUsages(canonicalSymbol);
         }
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index c0c323a93d9c644cb79ad57a59c85b7da3b1703f..9518e27a21e67d98998d4d8435571123a6272937 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -235,6 +235,9 @@ private Q_SLOTS:
     void updateSemanticInfo(const SemanticInfo &semanticInfo);
 
 private:
+    bool showWarningMessage() const;
+    void setShowWarningMessage(bool showWarningMessage);
+
     CPlusPlus::Symbol *markSymbols();
     bool sortedMethodOverview() const;
     CPlusPlus::Symbol *findDefinition(CPlusPlus::Symbol *symbol);
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 75f8f743b38074086eadd2f0670a500c04093776..5adc395870eb88e4d20f0837c67e60f972867376 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -562,6 +562,10 @@ void CppPreprocessor::sourceNeeded(QString &fileName, IncludeType type,
     doc = Document::create(fileName);
     doc->setRevision(m_revision);
 
+    QFileInfo info(fileName);
+    if (info.exists())
+        doc->setLastModified(info.lastModified());
+
     Document::Ptr previousDoc = switchDocument(doc);
 
     const QByteArray preprocessedCode = preprocess(fileName, contents);
@@ -588,6 +592,26 @@ Document::Ptr CppPreprocessor::switchDocument(Document::Ptr doc)
 }
 
 
+
+void CppTools::CppModelManagerInterface::updateModifiedSourceFiles()
+{
+    const Snapshot snapshot = this->snapshot();
+    QStringList sourceFiles;
+
+    foreach (const Document::Ptr doc, snapshot) {
+        const QDateTime lastModified = doc->lastModified();
+
+        if (! lastModified.isNull()) {
+            QFileInfo fileInfo(doc->fileName());
+
+            if (fileInfo.exists() && fileInfo.lastModified() != lastModified)
+                sourceFiles.append(doc->fileName());
+        }
+    }
+
+    updateSourceFiles(sourceFiles);
+}
+
 CppTools::CppModelManagerInterface *CppTools::CppModelManagerInterface::instance()
 {
     ExtensionSystem::PluginManager *pluginManager = ExtensionSystem::PluginManager::instance();
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h
index 9c6f0fb4432a06958c0bd1b50a4127c8e4c7cc71..1976df75eab41cac2dde91932c0517a51d9beebb 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.h
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.h
@@ -83,9 +83,6 @@ public:
 
     static CppModelManagerInterface *instance();
 
-    virtual void GC() = 0;
-    virtual void updateSourceFiles(const QStringList &sourceFiles) = 0;
-
     virtual QMap<QString, QString> workingCopy() const = 0;
     virtual CPlusPlus::Snapshot snapshot() const = 0;
 
@@ -104,6 +101,11 @@ public:
 
     virtual void renameUsages(CPlusPlus::Symbol *symbol) = 0;
     virtual void findUsages(CPlusPlus::Symbol *symbol) = 0;
+
+public Q_SLOTS:
+    void updateModifiedSourceFiles();
+    virtual void updateSourceFiles(const QStringList &sourceFiles) = 0;    
+    virtual void GC() = 0;
 };
 
 class CPPTOOLS_EXPORT AbstractEditorSupport
diff --git a/src/plugins/debugger/debuggeragents.cpp b/src/plugins/debugger/debuggeragents.cpp
index 558617d1ae1880ba4897891cc86ec205c1ad7a54..d29b5e506fcb4d88b2e4b3347d8f3b39060adf79 100644
--- a/src/plugins/debugger/debuggeragents.cpp
+++ b/src/plugins/debugger/debuggeragents.cpp
@@ -199,8 +199,6 @@ DisassemblerViewAgent::~DisassemblerViewAgent()
     d->locationMark = 0;
     delete d;
     d = 0;
-    delete d->locationMark;
-    d->locationMark = 0;
 }
 
 void DisassemblerViewAgent::cleanup()
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 6b3076ea2d7bcaf34e9f120b433b65b6a8659b6b..72fc1f30cae2c7e34928e2d8916ec76df44196eb 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1113,7 +1113,8 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
             setState(InferiorStopping);
         } else {
             // The user triggered a stop, but meanwhile the app simply exited ...
-            QTC_ASSERT(state() == InferiorStopping, qDebug() << state());
+            QTC_ASSERT(state() == InferiorStopping || state() == InferiorStopping_Kill,
+                       qDebug() << state());
         }
         setState(InferiorStopped);
         QString msg;
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index f92a6993fd32f7b9705b4d68ae6124ab2d9f15c9..afc5d257294c68613a446dd050320e28ec497ecf 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -75,8 +75,7 @@ StackWindow::StackWindow(DebuggerManager *manager, QWidget *parent)
 
 StackWindow::~StackWindow()
 {
-    // FIXME: leak
-    //delete m_disassemblerAgent;
+    delete m_disassemblerAgent;
 }
 
 void StackWindow::showAddressColumn(bool on)
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp
index 5bbf06af5125f9475c1b224074e8f975afbc7170..bcac543577dcc865e59f443ff7f6da052af6f44c 100644
--- a/src/plugins/find/searchresultwindow.cpp
+++ b/src/plugins/find/searchresultwindow.cpp
@@ -108,7 +108,6 @@ SearchResultWindow::~SearchResultWindow()
 void SearchResultWindow::setTextToReplace(const QString &textToReplace)
 {
     m_replaceTextEdit->setText(textToReplace);
-    m_replaceTextEdit->selectAll();
 }
 
 QString SearchResultWindow::textToReplace() const
@@ -233,6 +232,7 @@ void SearchResultWindow::setFocus()
                     || m_widget->focusWidget() == m_replaceTextEdit
                     || m_focusReplaceEdit) {
                 m_replaceTextEdit->setFocus();
+                m_replaceTextEdit->selectAll();
             } else {
                 m_searchResultTreeView->setFocus();
             }
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index e319388f8bfb795fcc43323093b6420725a7e633..4daa8009c3a7b2b17f4be987a1b2c3637d1b503f 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -73,7 +73,7 @@ BuildSettingsPanel::BuildSettingsPanel(Project *project)
 
 BuildSettingsPanel::~BuildSettingsPanel()
 {
-    delete m_widget;
+
 }
 
 QString BuildSettingsPanel::name() const
diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp
index 3d4fc5519ea52084236608b8647e8ee3f3bb0e6e..0c8ed3efa39296dd01b2de61396b83a323dc2c29 100644
--- a/src/plugins/projectexplorer/dependenciespanel.cpp
+++ b/src/plugins/projectexplorer/dependenciespanel.cpp
@@ -283,7 +283,7 @@ DependenciesPanel::DependenciesPanel(SessionManager *session, Project *project)
 
 DependenciesPanel::~DependenciesPanel()
 {
-    delete m_widget;
+
 }
 
 QString DependenciesPanel::name() const
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
index 82b185a4baba4ac1bb262b5546678694640bdfd4..e589ee0fd61a437f55ccd3c058939617bf078048 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
@@ -55,7 +55,7 @@ EditorSettingsPanel::EditorSettingsPanel(Project *project)
 
 EditorSettingsPanel::~EditorSettingsPanel()
 {
-    delete m_widget;
+
 }
 
 QString EditorSettingsPanel::name() const
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index 79e5566ad6807d61f37519cf456e2712ca379cb2..bfca5742ab212267166df4ab1bdd602f83061781 100644
--- a/src/plugins/projectexplorer/outputwindow.cpp
+++ b/src/plugins/projectexplorer/outputwindow.cpp
@@ -395,6 +395,7 @@ OutputWindow::OutputWindow(QWidget *parent)
 OutputWindow::~OutputWindow()
 {
     Core::ICore::instance()->removeContextObject(m_outputWindowContext);
+    delete m_outputWindowContext;
 }
 
 void OutputWindow::showEvent(QShowEvent *e)
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index 125c6c219330a78947cf69030bd4f4c60a201835..6a6708506c8dec69b5d9d98c9f3e503dd4489ab9 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -737,6 +737,8 @@ ProjectWindow::ProjectWindow(QWidget *parent)
 
 ProjectWindow::~ProjectWindow()
 {
+    qDeleteAll(m_panels);
+    m_panels.clear();
 }
 
 void ProjectWindow::projectAdded()
@@ -775,6 +777,9 @@ void ProjectWindow::showProperties(Project *project)
     // Remove the tabs from the tab widget first
     m_panelsWidget->clear();
 
+    qDeleteAll(m_panels);
+    m_panels.clear();
+
     m_panelsWidget->addWidget(tr("Active Build and Run Configurations"), m_activeConfigurationWidget);
     m_panelsWidget->addWidget(m_spacerBetween);
     m_panelsWidget->addWidget(m_projectChooser);
@@ -788,6 +793,7 @@ void ProjectWindow::showProperties(Project *project)
                 if (debug)
                   qDebug() << "ProjectWindow - setting up project properties tab " << panel->name();
                 m_panelsWidget->addWidget(panel->name(), panel->widget());
+                m_panels.push_back(panel);
             }
         }
     }
diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h
index 2ad04af4cbf46a5473bf3e8f559e9d771ea7242b..c183a92805f02302a3c6249d523a285fcc6be04f 100644
--- a/src/plugins/projectexplorer/projectwindow.h
+++ b/src/plugins/projectexplorer/projectwindow.h
@@ -191,6 +191,7 @@ private:
     QWidget *m_projectChooser;
     QLabel *m_noprojectLabel;
     PanelsWidget *m_panelsWidget;
+    QList<PropertiesPanel *> m_panels;
 };
 
 
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index 055341f6bebd55c50cb68c9f49db72aae733a8b5..c7fc27525c49c9449e82179db71e672f9142eaac 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -111,7 +111,7 @@ RunSettingsPanel::RunSettingsPanel(Project *project)
 
 RunSettingsPanel::~RunSettingsPanel()
 {
-    delete m_widget;
+
 }
 
 QString RunSettingsPanel::name() const
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index eea09595cd66de10b6d471b1cb7b4d34d00eff3b..a5b91c006bf0113af2a233dd262997c179de278f 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -114,7 +114,7 @@ QString ToolChain::toolChainName(ToolChainType tc)
 //    case LinuxICC:
 //        return QCoreApplication::translate("ToolChain", "Intel C++ Compiler (Linux)");
     case MinGW:
-        return QCoreApplication::translate("ToolChain", "MinGW");
+        return QString::fromLatin1("MinGW");
     case MSVC:
         return QCoreApplication::translate("ToolChain", "Microsoft Visual C++");
     case WINCE:
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index 0a843c874c415587caea0475bd4123c1765f5aa2..ef04ec8c4d668d9cbea61ca6bc1b4c39e6ab4f29 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
@@ -332,9 +332,6 @@ QStringList GettingStartedWelcomePageWidget::tipsOfTheDay()
         tips.append(tr("Within a session, you can add "
                        "<a href=\"qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies\">dependencies</a> between projects."));
         tips.append(tr("You can set the preferred editor encoding for every project in <tt>Projects -> Editor Settings -> Default Encoding</tt>."));
-        tips.append(tr("You can modify the binary that is being executed when you press the <tt>Run</tt> button: Add a <tt>Custom Executable</tt> "
-                       "by clicking the <tt>+</tt> button in <tt>Projects -> Run Settings -> Run Configuration</tt> and then select the new "
-                       "target in the combo box."));
         tips.append(tr("You can use Qt Creator with a number of <a href=\"qthelp://com.nokia.qtcreator/doc/creator-version-control.html\">"
                        "revision control systems</a> such as Subversion, Perforce, CVS and Git."));
         tips.append(tr("In the editor, <tt>F2</tt> follows symbol definition, <tt>Shift+F2</tt> toggles declaration and definition "
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 032dc8734e7db560b481b0b32293bbedaa56b0f6..7bfaf41100bf3d453bc7837f27ad2ee00fd60521 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -521,11 +521,10 @@ QString QtVersion::toHtml() const
         << "</b></td><td>" << m_qmakeCommand << "</td></tr>";
     updateVersionInfo();
     if (m_defaultConfigIsDebug || m_defaultConfigIsDebugAndRelease) {
-        str << "<tr><td><b>" << QtVersionManager::tr("Default:") << "</b></td><td>";
-        if (m_defaultConfigIsDebug)
-            str << "debug";
+        str << "<tr><td><b>" << QtVersionManager::tr("Default:") << "</b></td><td>"
+            << (m_defaultConfigIsDebug ? "debug" : "release");
         if (m_defaultConfigIsDebugAndRelease)
-                    str << "default_and_release";
+            str << " debug_and_release";
         str << "</td></tr>";
     } // default config.
     str << "<tr><td><b>" << QtVersionManager::tr("Version:")
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
index 898125fa11a203d458c058b6b835872aeb5b4a61..4c5f6acf25d4c1686fdbc41e76806061c5a68ff8 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -179,7 +179,7 @@ p, li { white-space: pre-wrap; }
       <item row="3" column="0">
        <widget class="QLabel" name="mingwLabel">
         <property name="text">
-         <string>MinGw Directory:</string>
+         <string>MinGW Directory:</string>
         </property>
        </widget>
       </item>
diff --git a/src/tools/qpatch/files-to-patch-linux b/src/tools/qpatch/files-to-patch-linux
index 0efa3be226d88f1f8253198c196c06234afbe6e5..2cf70c97291f3560934a2dd28e9821cd7ffcae55 100644
--- a/src/tools/qpatch/files-to-patch-linux
+++ b/src/tools/qpatch/files-to-patch-linux
@@ -1,5 +1,5 @@
 bin/qmake
-lib/libQtCore.so.4.5.2
+lib/libQtCore.so
 %%
 lib/libQtCore.la
 lib/libQt3Support.la
@@ -7,6 +7,7 @@ lib/libQtCLucene.la
 lib/libQtDBus.la
 lib/libQtGui.la
 lib/libQtHelp.la
+lib/libQtMultimedia.la
 lib/libQtNetwork.la
 lib/libQtOpenGL.la
 lib/libQtScript.la
@@ -27,6 +28,7 @@ lib/libQtDesignerComponents.prl
 lib/libQtDesigner.prl
 lib/libQtGui.prl
 lib/libQtHelp.prl
+lib/libQtMultimedia.prl
 lib/libQtNetwork.prl
 lib/libQtOpenGL.prl
 lib/libQtScript.prl
@@ -47,6 +49,7 @@ lib/pkgconfig/QtDesignerComponents.pc
 lib/pkgconfig/QtDesigner.pc
 lib/pkgconfig/QtGui.pc
 lib/pkgconfig/QtHelp.pc
+lib/pkgconfig/QtMultimedia.pc
 lib/pkgconfig/QtNetwork.pc
 lib/pkgconfig/QtOpenGL.pc
 lib/pkgconfig/QtScript.pc
diff --git a/src/tools/qpatch/files-to-patch-windows b/src/tools/qpatch/files-to-patch-windows
index c62825fd2ae409ce529718c958537b36c8d2bf5f..38545a7defc758085c74baf44ccb31618a219d64 100644
--- a/src/tools/qpatch/files-to-patch-windows
+++ b/src/tools/qpatch/files-to-patch-windows
@@ -2,6 +2,7 @@ bin/Qt3Supportd4.dll
 bin/QtCored4.dll
 bin/QtGuid4.dll
 bin/QtHelpd4.dll
+bin/QtMultimediad4.dll
 bin/QtNetworkd4.dll
 bin/QtOpenGLd4.dll
 bin/QtScriptd4.dll
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index c92abc004df062a558865c10bdd81fb1444ceac2..2cb677968c5a18aa77d0ac2e66973ee0cd0e7059 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -392,7 +392,7 @@ static void testDumper(QByteArray expected0, const void *data, QByteArray outert
         extraInt0, extraInt1, extraInt2, extraInt3);
     QString expected(expected0);
     char buf[100];
-    sprintf(buf, pointerPrintFormat(), (uintptr_t)data);
+    sprintf(buf, pointerPrintFormat(), (quintptr)data);
     if ((!expected.startsWith('t') && !expected.startsWith('f'))
             || expected.startsWith("type"))
         expected = "tiname='$I',addr='$A'," + expected;
@@ -422,7 +422,7 @@ static void testDumper(QByteArray expected0, const void *data, QByteArray outert
 QByteArray str(const void *p)
 {
     char buf[100];
-    sprintf(buf, pointerPrintFormat(), (uintptr_t)p);
+    sprintf(buf, pointerPrintFormat(), (quintptr)p);
     return buf;
 }
 
@@ -1554,6 +1554,7 @@ template <typename K, typename V>
 
 void tst_Debugger::dumpQMap()
 {
+    qDebug() << "QMap<int, int>";
     // Case 1: Simple type -> simple type.
     QMap<int, int> map1;
 
@@ -1569,6 +1570,7 @@ void tst_Debugger::dumpQMap()
     dumpQMapHelper(map1);
 
     // Case 2: Simple type -> composite type.
+    qDebug() << "QMap<int, QString>";
     QMap<int, QString> map2;
 
     // Case 2.1: Empty Map.
@@ -1583,6 +1585,7 @@ void tst_Debugger::dumpQMap()
     dumpQMapHelper(map2);
 
     // Case 3: Composite type -> simple type.
+    qDebug() << "QMap<QString, int>";
     QMap<QString, int> map3;
 
     // Case 3.1: Empty map.
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index b6a4e2ab74874e60d1d141a93328137aaeb5d87e..79b66523761ca60cf9e91b2b354bcdce63b832af 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -3,11 +3,12 @@
 bool checkUninitialized = false;
 //#define DO_DEBUG 1
 
+#include "gdb/gdbmi.h"
+
 #include <QtCore/QThread>
 #include <QtCore/QMutex>
 #include <QtCore/QWaitCondition>
 
-
 /*
 #include <QtGui/QBitmap>
 #include <QtGui/QBrush>
@@ -23,8 +24,9 @@ bool checkUninitialized = false;
 
 #include <QtTest/QtTest>
 
-#include "gdb/gdbmi.h"
-
+#ifdef Q_OS_WIN
+#    include <windows.h>
+#endif
 
 #undef NS
 #ifdef QT_NAMESPACE
@@ -593,6 +595,9 @@ tst_Gdb::tst_Gdb()
 
 void tst_Gdb::initTestCase()
 {
+#ifndef Q_CC_GNU
+    QSKIP("gdb test not applicable for compiler", SkipAll);
+#endif   
     //qDebug() << "\nTHREAD RUN" << getpid() << gettid();
     QProcess *gdbProc = new QProcess;
     QStringList args;