Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/3rdparty/botan/botan.qbs
	src/libs/ssh/ssh.qbs
	src/plugins/qnx/blackberryqtversion.cpp

Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9

tests/manual/debugger/simple/simple_test_app.cpp

@@ -681,10 +681,10 @@ namespace undefined {
         int *i = new int;
         delete i;
         BREAK_HERE;
+        // Continue.
         // Manual: Uncomment the following line. Step.
         // On Linux, a SIGABRT should be received.
         //delete i;
-        // Continue.
         dummyStatement(&i);
     }
 

tests/system/suite_general/tst_select_all/test.py

@@ -43,9 +43,6 @@ def main():
                 pos = size
                 if key == "<Left>":
                     pos -= 1
-                    if JIRA.isBugStillOpen(7215, JIRA.Bug.CREATOR):
-                        test.warning("Using workaround for %s-%d" % (JIRA.Bug.CREATOR, 7215))
-                        pos = 0
                 test.compare(editor.textCursor().selectionStart(), pos)
                 test.compare(editor.textCursor().selectionEnd(), pos)
                 test.compare(editor.textCursor().position(), pos)