Merge remote-tracking branch 'origin/3.1'

Conflicts:
	src/plugins/ios/iosdeploystep.cpp

Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f

12 files changed, 87 insertions, 15 deletions

diff --git a/dist/changes-3.1.1 b/dist/changes-3.1.1
new file mode 100644
index 0000000000..f3023e5691
--- /dev/null
+++ b/dist/changes-3.1.1
@@ -0,0 +1,52 @@
+Qt Creator version 3.1.1 is a bugfix release.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+git clone git://gitorious.org/qt-creator/qt-creator.git
+git log --cherry-pick --pretty=oneline v3.1.0..v3.1.1
+
+General
+   * Fixed editing of MIME types while filtering is applied
+     (QTCREATORBUG-12149)
+
+Managing and Building Projects
+   * Fixed performance regression in Issues pane (QTCREATORBUG-12109)
+
+Qbs Projects
+   * Fixed support for VS2013 compiler (QTCREATORBUG-11025)
+
+C++ Support
+   * Fixed issue with missing semantic highlighting (QTCREATORBUG-11367)
+
+Qt Quick Designer
+   * Fixed several UI issues (QTCREATORBUG-12040, QTCREATORBUG-12035,
+     QTCREATORBUG-11904, QTCREATORBUG-12018)
+   * Fixed anchor and alignment handling (QTCREATORBUG-12006)
+
+Diff Viewer
+   * Fixed crash when showing binary file containing carriage return character
+     (QTCREATORBUG-12056)
+
+Version Control Systems
+   * Git
+      * Fixed encoding issues on Window
+      * Fixed crash when closing Qt Creator after revert (QTCREATORBUG-12099)
+
+FakeVim
+
+Platform Specific
+
+QNX
+   * Fixed crash when no device is configured (QTCREATORBUG-12143)
+   * Fixed Qt environment settings for running on devices (QTCREATORBUG-12171)
+
+Android
+   * Fixed selection of Ant executable on OS X (QTCREATORBUG-12184)
+
+iOS
+   * Fixed parsing of build issues
+   * Added warning if provisioning profile does not contain selected device
+     (QTCREATORBUG-12175)
+
diff --git a/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json b/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
index af78f3a405..733e0c9544 100644
--- a/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
+++ b/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
@@ -8,30 +8,46 @@
         "__javascriptQt5__"],
     "supportedImports": [
         "Qt.labs.folderlistmodel 2.0",
+        "Qt.labs.folderlistmodel 2.1",
+        "Qt.labs.settings 1.0",
+        "Qt.WebSockets 1.0",
         "QtAudioEngine 1.0",
         "QtBluetooth 5.0",
         "QtBluetooth 5.2",
+        "QtBluetooth 5.3",
+        "QtDataVisualization 1.0",
         "QtGraphicalEffects 1.0",
         "QtMultimedia 5.0",
         "QtNfc 5.0",
         "QtNfc 5.2",
+        "QtNfc 5.3",
         "QtPositioning 5.0",
         "QtPositioning 5.2",
+        "QtPositioning 5.3",
+        "QtPurchasing 1.0",
         "QtQuick.Controls 1.0",
         "QtQuick.Controls 1.1",
+        "QtQuick.Controls 1.2",
         "QtQuick.Controls.Styles 1.0",
         "QtQuick.Controls.Styles 1.1",
+        "QtQuick.Controls.Styles 1.2",
         "QtQuick.Dialogs 1.0",
         "QtQuick.Dialogs 1.1",
+        "QtQuick.Dialogs 1.2",
+        "QtQuick.Enterprise.Controls 1.1",
         "QtQuick.Layouts 1.0",
         "QtQuick.Layouts 1.1",
         "QtQuick.LocalStorage 2.0",
         "QtQuick.Particles 2.0",
         "QtQuick.Window 2.0",
         "QtQuick.XmlListModel 2.0",
+        "QtSensors 5.3",
         "QtQuick 2.0",
         "QtQuick 2.1",
         "QtQuick 2.2",
+        "QtQuick 2.3",
         "QtTest 1.0",
-        "QtWebKit 3.0"]
+        "QtWebKit 3.0",
+        "Enginio 1.0"
+    ]
 }
diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp
index 66521dc32b..73f5b7c991 100644
--- a/src/plugins/coreplugin/find/findtoolwindow.cpp
+++ b/src/plugins/coreplugin/find/findtoolwindow.cpp
@@ -32,6 +32,7 @@
 #include "findplugin.h"
 
 #include <coreplugin/icore.h>
+#include <utils/qtcassert.h>
 
 #include <QSettings>
 #include <QStringListModel>
@@ -225,17 +226,18 @@ void FindToolWindow::acceptAndGetParameters(QString *term, IFindFilter **filter)
 void FindToolWindow::search()
 {
     QString term;
-    IFindFilter *filter;
+    IFindFilter *filter = 0;
     acceptAndGetParameters(&term, &filter);
-    if (filter)
-        filter->findAll(term, m_plugin->findFlags());
+    QTC_ASSERT(filter, return);
+    filter->findAll(term, m_plugin->findFlags());
 }
 
 void FindToolWindow::replace()
 {
     QString term;
-    IFindFilter *filter;
+    IFindFilter *filter = 0;
     acceptAndGetParameters(&term, &filter);
+    QTC_ASSERT(filter, return);
     filter->replaceAll(term, m_plugin->findFlags());
 }
 
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index c14ba0ffe6..ecc2c0f050 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -93,7 +93,7 @@ bool IosDeployStep::init()
     m_device = ProjectExplorer::DeviceKitInformation::device(target()->kit());
     IosRunConfiguration * runConfig = qobject_cast<IosRunConfiguration *>(
                 this->target()->activeRunConfiguration());
-    QTC_CHECK(runConfig);
+    QTC_ASSERT(runConfig, return false);
     m_bundlePath = runConfig->bundleDirectory().toString();
     if (m_device.isNull()) {
         emit addOutput(tr("Error: no device available, deploy failed."),
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index 42a33bb0e4..d6700fe202 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -73,8 +73,8 @@ Utils::Environment QnxRunConfiguration::environment() const
                         m_qtLibPath + QLatin1String("/qml:$QML2_IMPORT_PATH"));
         env.appendOrSet(QLatin1String("QT_PLUGIN_PATH"),
                         m_qtLibPath + QLatin1String("/plugins:$QT_PLUGIN_PATH"));
-        env.appendOrSet(QLatin1String("QT_QPA_FONTDIR"),
-                        m_qtLibPath + QLatin1String("/lib/fonts:$QT_QPA_FONTDIR"));
+        env.set(QLatin1String("QT_QPA_FONTDIR"),
+                        m_qtLibPath + QLatin1String("/lib/fonts"));
     }
 
     return env;
diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp
index 1efee3ef9a..2613e7d439 100644
--- a/src/plugins/qtsupport/qtkitconfigwidget.cpp
+++ b/src/plugins/qtsupport/qtkitconfigwidget.cpp
@@ -108,7 +108,7 @@ QWidget *QtKitConfigWidget::buttonWidget() const
 
 static QString itemNameFor(const BaseQtVersion *v)
 {
-    QTC_CHECK(v);
+    QTC_ASSERT(v, return QString());
     QString name = v->displayName();
     if (!v->isValid())
         name = QCoreApplication::translate("QtSupport::Internal::QtKitConfigWidget", "%1 (invalid)").arg(v->displayName());
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp
index ce3cb99007..a66a042075 100644
--- a/src/plugins/texteditor/plaintexteditor.cpp
+++ b/src/plugins/texteditor/plaintexteditor.cpp
@@ -132,6 +132,7 @@ void PlainTextEditorWidget::configure(const QString &mimeType)
 void PlainTextEditorWidget::configure(const MimeType &mimeType)
 {
     Highlighter *highlighter = new Highlighter();
+    highlighter->setTabSettings(baseTextDocument()->tabSettings());
     baseTextDocument()->setSyntaxHighlighter(highlighter);
 
     setCodeFoldingSupported(false);
diff --git a/tests/system/objects.map b/tests/system/objects.map
index efdbb4543d..5b4e33a68a 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -16,7 +16,6 @@
 :*Qt Creator.Widget Box_QDockWidget	{name='WidgetBoxDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Widget Box'}
 :*Qt Creator.findEdit_Utils::FilterLineEdit	{name='findEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Core::Internal::FancyToolButton	{occurrence='3' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:*Qt Creator_Help::Internal::HelpViewer	{type='Help::Internal::HelpViewer' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Utils::FilterLineEdit	{type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Utils::IconButton	{occurrence='4' type='Utils::IconButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :About Qt Creator_Core::Internal::VersionDialog	{type='Core::Internal::VersionDialog' unnamed='1' visible='1' windowTitle='About Qt Creator'}
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 9bab471de6..07e0317cfe 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -240,7 +240,8 @@ def createProject_Qt_GUI(path, projectName, checks = True, addToVersionControl =
     __createProjectHandleLastPage__(expectedFiles, addToVersionControl)
 
     progressBarWait(20000)
-    __verifyFileCreation__(path, expectedFiles)
+    if checks:
+        __verifyFileCreation__(path, expectedFiles)
     return checkedTargets
 
 # Creates a Qt Console project
@@ -264,7 +265,8 @@ def createProject_Qt_Console(path, projectName, checks = True):
     __createProjectHandleLastPage__(expectedFiles)
 
     progressBarWait(10000)
-    __verifyFileCreation__(path, expectedFiles)
+    if checks:
+        __verifyFileCreation__(path, expectedFiles)
     return checkedTargets
 
 def createNewQtQuickApplication(workingDir, projectName = None,
diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py
index 69e8e0e956..e7ece48b46 100755
--- a/tests/system/suite_HELP/tst_HELP04/test.py
+++ b/tests/system/suite_HELP/tst_HELP04/test.py
@@ -111,7 +111,7 @@ def main():
             mouseClick(waitForObject(":Hits_QCLuceneResultWidget"), 1, 1, 0, Qt.LeftButton)
             type(waitForObject(":Hits_QCLuceneResultWidget"), "<Tab>")
             type(waitForObject(":Hits_QCLuceneResultWidget"), "<Return>")
-            waitFor("__getUrl__() != url or selText != __getSelectedText__()")
+            waitFor("__getUrl__() != url or selText != __getSelectedText__()", 20000)
             # verify if search keyword is found in results
             test.verify(searchKeyword.lower() in __getSelectedText__().lower(),
                         searchKeyword + " search result can be found")
diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py
index 91fb5ef1d2..708d6b14a6 100755
--- a/tests/system/suite_WELP/tst_WELP01/test.py
+++ b/tests/system/suite_WELP/tst_WELP01/test.py
@@ -63,7 +63,7 @@ def main():
     if not startedWithoutPluginError():
         return
     installLazySignalHandler(":QWebPage","loadFinished(bool)", "webPageContentLoaded")
-    installLazySignalHandler(":*Qt Creator_Help::Internal::HelpViewer", "loadFinished(bool)",
+    installLazySignalHandler(":Qt Creator_Help::Internal::HelpViewer", "loadFinished(bool)",
                              "webPageContentLoaded")
     setAlwaysStartFullHelp()
     addCurrentCreatorDocumentation()
diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py
index f7f79bf155..fb84563eb9 100644
--- a/tests/system/suite_WELP/tst_WELP03/test.py
+++ b/tests/system/suite_WELP/tst_WELP03/test.py
@@ -68,7 +68,7 @@ def main():
     if not startedWithoutPluginError():
         return
     installLazySignalHandler(":QWebPage","loadFinished(bool)", "webPageContentLoaded")
-    installLazySignalHandler(":*Qt Creator_Help::Internal::HelpViewer", "loadFinished(bool)",
+    installLazySignalHandler(":Qt Creator_Help::Internal::HelpViewer", "loadFinished(bool)",
                              "webPageContentLoaded")
     qt5sdkPath = qt5SDKPath()
     qchs = [os.path.join(sdkPath, "Documentation", "qt.qch"),