Merge remote-tracking branch 'origin/4.9'

 Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6

9 files changed, 79 insertions, 17 deletions

diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py
index 7819d6d5c8..b7aa8811bb 100644
--- a/share/qtcreator/debugger/gdbbridge.py
+++ b/share/qtcreator/debugger/gdbbridge.py
@@ -892,16 +892,33 @@ class Dumper(DumperBase):
     def createSpecialBreakpoints(self, args):
         self.specialBreakpoints = []
         def newSpecial(spec):
+            # GDB < 8.1 does not have the 'qualified' parameter here,
+            # GDB >= 8.1 applies some generous pattern matching, hitting
+            # e.g. also Foo::abort() when asking for '::abort'
+            class Pre81SpecialBreakpoint(gdb.Breakpoint):
+                def __init__(self, spec):
+                    super(Pre81SpecialBreakpoint, self).__init__(spec,
+                        gdb.BP_BREAKPOINT, internal=True)
+                    self.spec = spec
+
+                def stop(self):
+                    print("Breakpoint on '%s' hit." % self.spec)
+                    return True
+
             class SpecialBreakpoint(gdb.Breakpoint):
                 def __init__(self, spec):
-                    super(SpecialBreakpoint, self).\
-                        __init__(spec, gdb.BP_BREAKPOINT, internal=True)
+                    super(SpecialBreakpoint, self).__init__(spec,
+                        gdb.BP_BREAKPOINT, internal=True, qualified=True)
                     self.spec = spec
 
                 def stop(self):
                     print("Breakpoint on '%s' hit." % self.spec)
                     return True
-            return SpecialBreakpoint(spec)
+
+            try:
+                return SpecialBreakpoint(spec)
+            except:
+                return Pre81SpecialBreakpoint(spec)
 
         # FIXME: ns is accessed too early. gdb.Breakpoint() has no
         # 'rbreak' replacement, and breakpoints created with
@@ -1279,7 +1296,7 @@ class Dumper(DumperBase):
             frame = gdb.newest_frame()
             ns = self.qtNamespace()
             needle = self.qtNamespace() + 'QV4::ExecutionEngine'
-            pat = '%sqt_v4StackTrace(((%sQV4::ExecutionEngine *)0x%x)->currentContext)'
+            pat = '%sqt_v4StackTrace(((%sQV4::ExecutionEngine *)0x%x)->currentContext())'
             done = False
             while i < limit and frame and not done:
                 block = None
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 1a30debf3f..77cb2fa512 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -478,8 +478,8 @@ def qdump__QDir(d, value):
                 typ = d.lookupType(ns + 'QString')
                 d.putItem(d.createValue(privAddress + absoluteDirEntryOffset, typ))
             with SubItem(d, 'entryInfoList'):
-                typ = d.lookupType(ns + 'QList<' + ns + 'QFileInfo>')
-                d.putItem(d.createValue(privAddress + fileInfosOffset, typ))
+                typ = d.lookupType(ns + 'QFileInfo')
+                qdumpHelper_QList(d, privAddress + fileInfosOffset, typ)
             with SubItem(d, 'entryList'):
                 typ = d.lookupType(ns + 'QStringList')
                 d.putItem(d.createValue(privAddress + filesOffset, typ))
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
index 4ced9e026b..d26bec5ec6 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
@@ -80,10 +80,19 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 3,
+                        "index": 1,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.13",
+                                "value":
+                                "({
+                                    'QtQuickVersion': '2.13',
+                                    'QtQuickWindowVersion': '2.13',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
+                                })"
+                            },
+                            {
                                 "trKey": "Qt 5.12",
                                 "value":
                                 "({
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
index 656f5d3596..b19188a3c8 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
@@ -83,10 +83,19 @@
                     "visible": false,
                     "data":
                     {
-                        "index": 3,
+                        "index": 1,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.13",
+                                "value":
+                                "({
+                                    'QtQuickVersion': '2.13',
+                                    'QtQuickControlsVersion': '2.13',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
+                                })"
+                            },
+                            {
                                 "trKey": "Qt 5.12",
                                 "value":
                                 "({
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
index 99cf484850..0b0f8558ac 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
@@ -82,10 +82,19 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 3,
+                        "index": 1,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.13",
+                                "value":
+                                "({
+                                    'QtQuickVersion': '2.13',
+                                    'QtQuickControlsVersion': '2.13',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
+                                })"
+                            },
+                            {
                                 "trKey": "Qt 5.12",
                                 "value":
                                 "({
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
index f5918f35e0..a89e6cce26 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
@@ -82,10 +82,19 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 3,
+                        "index": 1,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.13",
+                                "value":
+                                "({
+                                    'QtQuickVersion': '2.13',
+                                    'QtQuickControlsVersion': '2.13',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
+                                })"
+                            },
+                            {
                                 "trKey": "Qt 5.12",
                                 "value":
                                 "({
diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
index 89dbe871d6..7d059b8d4c 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
@@ -40,10 +40,19 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 3,
+                        "index": 1,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.13",
+                                "value":
+                                "({
+                                    'QtQuickVersion': '2.13',
+                                    'QtQuickWindowVersion': '2.13',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
+                                })"
+                            },
+                            {
                                 "trKey": "Qt 5.12",
                                 "value":
                                 "({
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index 3b11572903..ff2af332fe 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -137,11 +137,11 @@ IconsDebugColor=toolBarItem
 IconsNavigationArrowsColor=ffebc322
 IconsBuildHammerHandleColor=ffb06112
 IconsBuildHammerHeadColor=ff828384
-IconsModeWelcomeActiveColor=ff80c342
+IconsModeWelcomeActiveColor=ff1f6c97
 IconsModeEditActiveColor=ff99aaef
 IconsModeDesignActiveColor=ffbb6000
 IconsModeDebugActiveColor=ff99aaef
-IconsModeProjectActiveColor=ff80c342
+IconsModeProjectActiveColor=ff1f6c97
 IconsModeAnalyzeActiveColor=ff43adee
 IconsModeHelpActiveColor=fff4be04
 IconsCodeModelKeywordColor=ff777777
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 9ae7851207..0000669c6f 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -2929,7 +2929,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables stepping backwards.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This feature is very slow and unstable on the GDB side. It exhibits unpredictable behavior when going backwards over system calls and is very likely to destroy your debugging session.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rückwärts-Debuggen aktivieren.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt; Diese Funktionalität ist sehr langsam und instabil auf Seiten von GDB. Es kann unvorhergesehenes Verhalten auftreten, wenn man rückwärts über einen Systemaufruf springt, und die Debugger-Sitzung kann leicht zerstört werden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rückwärts-Debuggen aktivieren.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt; Diese Funktionalität ist sehr langsam und instabil innerhalb von GDB. Es kann unvorhergesehenes Verhalten auftreten, wenn man rückwärts über einen Systemaufruf springt, und die Debugger-Sitzung kann leicht zerstört werden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Debug all child processes</source>
@@ -6790,7 +6790,7 @@ Außer: %2
     </message>
     <message>
         <source>Use jom instead of nmake</source>
-        <translation>jom an Stelle von nmake verwenden</translation>
+        <translation>jom statt nmake verwenden</translation>
     </message>
     <message>
         <source>Current directory</source>
@@ -23157,7 +23157,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
     </message>
     <message>
         <source>Use %1 instead of &apos;var&apos; or &apos;variant&apos; to improve performance.</source>
-        <translation>Zur Steigerung der Ausführungsgeschwindigkeit sollte %1 an Stelle von &apos;var&apos; oder &apos;variant&apos; verwendet werden.</translation>
+        <translation>Zur Steigerung der Ausführungsgeschwindigkeit sollte %1 statt &apos;var&apos; oder &apos;variant&apos; verwendet werden.</translation>
     </message>
     <message>
         <source>This type (%1) is not supported in the Qt Quick Designer.</source>
@@ -33940,7 +33940,7 @@ Senden selbst auch Zeit benötigt.</translation>
     </message>
     <message>
         <source>This feature is very slow and unstable on the GDB side. It exhibits unpredictable behavior when going backwards over system calls and is very likely to destroy your debugging session.</source>
-        <translation>Diese Funktionalität ist sehr langsam und instabil auf Seiten von GDB. Es kann unvorhergesehenes Verhalten auftreten, wenn man rückwärts über einen Systemaufruf springt, und die Debugger-Sitzung kann leicht unbenutzbar werden.</translation>
+        <translation>Diese Funktionalität ist sehr langsam und instabil innerhalb von GDB. Es kann unvorhergesehenes Verhalten auftreten, wenn man rückwärts über einen Systemaufruf springt, und die Debugger-Sitzung kann leicht unbenutzbar werden.</translation>
     </message>
     <message>
         <source>Reverse Direction</source>