From 1c793cf6a591e1068418ddbe71fda2cf43f8913b Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Thu, 15 May 2014 13:57:22 +0200 Subject: [PATCH 01/10] qmljs: update import completion list Change-Id: Ibad88750c9c136ea1a502b80d5333d7839c32cde Reviewed-by: Kai Koehne Reviewed-by: Thomas Hartmann --- .../qt5QtQuick2-bundle.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json b/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json index af78f3a4050..733e0c95449 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" + ] } From 1f45eb2c210b033a30976ec9ddec5b4e8339ade4 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 19 May 2014 08:37:19 +0200 Subject: [PATCH 02/10] Editor: Set tabsettings on new generic highlighter. Task-number: QTCREATORBUG-12172 Change-Id: I5194da0f6c8c1c453906c9752fc2fdf0e8b0b1be Reviewed-by: Christian Stenger --- src/plugins/texteditor/plaintexteditor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp index 6b2ef7097b9..afea6e7a2cf 100644 --- a/src/plugins/texteditor/plaintexteditor.cpp +++ b/src/plugins/texteditor/plaintexteditor.cpp @@ -133,6 +133,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); From 29e4ed9f568d4314242a9a4ccb42b254f351b9df Mon Sep 17 00:00:00 2001 From: hjk Date: Sat, 17 May 2014 21:17:15 +0200 Subject: [PATCH 03/10] Find: Fix an issue found by clang static analyzer Change-Id: Id556e670930b0f8e2ee47fb413c443b79a86f4d4 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/find/findtoolwindow.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp index 66521dc32b2..73f5b7c9914 100644 --- a/src/plugins/coreplugin/find/findtoolwindow.cpp +++ b/src/plugins/coreplugin/find/findtoolwindow.cpp @@ -32,6 +32,7 @@ #include "findplugin.h" #include +#include #include #include @@ -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()); } From 129d062a73bad5cb3c24119640f2fd6d882620e8 Mon Sep 17 00:00:00 2001 From: hjk Date: Sat, 17 May 2014 22:53:00 +0200 Subject: [PATCH 04/10] IosDeployStep: use QTC_ASSERT when appropriate Change-Id: I487f3ead6b72d558670dd4045c44b8ab09336e29 Reviewed-by: Fawzi Mohamed --- src/plugins/ios/iosdeploystep.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 8f59feacf52..322eb1d3b75 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( this->target()->activeRunConfiguration()); - QTC_CHECK(runConfig); + QTC_ASSERT(runConfig, return false); m_bundlePath = runConfig->bundleDir().toString(); if (m_device.isNull()) { emit addOutput(tr("Error: no device available, deploy failed."), From f0a04d7ab5614df8b8141243c7fb92a9d1a1fade Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 19 May 2014 12:20:57 +0200 Subject: [PATCH 05/10] Squish: Fix invocation of __verifyFileCreation__ Change-Id: Ib7a72de2a36e3a5d0069ca16ab054c1f1013f06c Reviewed-by: Robert Loehning --- tests/system/shared/project.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 9bab471de67..07e0317cfed 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, From a0c7ee35206ae31f56a3aa29c7b1b1b9c606c901 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 19 May 2014 16:40:22 +0200 Subject: [PATCH 06/10] Add changes file for 3.1.1 Change-Id: Id32ed8816ee8f67ffde1daaee3fd5c2d83448f95 Reviewed-by: Leena Miettinen --- dist/changes-3.1.1 | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 dist/changes-3.1.1 diff --git a/dist/changes-3.1.1 b/dist/changes-3.1.1 new file mode 100644 index 00000000000..f3023e56917 --- /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) + From 2b9e3ad83f9a6df044a7bcb0663377e7c73942ed Mon Sep 17 00:00:00 2001 From: hjk Date: Sat, 17 May 2014 22:15:29 +0200 Subject: [PATCH 07/10] QtSupport: Use QTC_ASSERT instead of QTC_CHECK if needed Change-Id: Ifa588c3a2f7d8b3417cf86b22a8ba013e4cba362 Reviewed-by: Orgad Shaneh Reviewed-by: Nikita Baryshnikov Reviewed-by: Tobias Hunger --- src/plugins/qtsupport/qtkitconfigwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp index 1efee3ef9ad..2613e7d439d 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()); From 7c672821cd633422d84cc22f72e34facf2aefb2a Mon Sep 17 00:00:00 2001 From: El Mehdi Fekari Date: Mon, 19 May 2014 16:00:23 +0200 Subject: [PATCH 08/10] Qnx: Correctly set QT_QPA_FONTDIR The value should contain one unique directory where the fonts are located. Change-Id: I3471abcf3052a181c20dcc1bc2903d111764063b Reviewed-by: Sergio Ahumada Reviewed-by: Eike Ziller --- src/plugins/qnx/qnxrunconfiguration.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp index 42a33bb0e40..d6700fe202e 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; From 4b00139b29cbebc1aa5d6ccbb6742a45609ff2be Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 19 May 2014 16:30:58 +0200 Subject: [PATCH 09/10] Squish: Set timeout for waitFor Change-Id: I669a5974c173aca6341c49d9d32044a40da42c9d Reviewed-by: Christian Stenger --- tests/system/suite_HELP/tst_HELP04/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py index 69e8e0e9568..e7ece48b460 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"), "") type(waitForObject(":Hits_QCLuceneResultWidget"), "") - 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") From 88d76de059389382d1f8e8c4ddedd497f2760d61 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 19 May 2014 16:53:51 +0200 Subject: [PATCH 10/10] Squish: Remove pointless object Change-Id: I5acd2d0dfceffa9c5f693cec0dbb4f54207aa9da Reviewed-by: Christian Stenger --- tests/system/objects.map | 1 - tests/system/suite_WELP/tst_WELP01/test.py | 2 +- tests/system/suite_WELP/tst_WELP03/test.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index efdbb4543d2..5b4e33a68a7 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/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index 91fb5ef1d27..708d6b14a62 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 f7f79bf1553..fb84563eb9c 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"),