Merge remote-tracking branch 'origin/3.1'

doc/config/qtcreator-project.qdocconf

@@ -7,23 +7,23 @@ imagedirs = $SRCDIR/images $SRCDIR/templates/images
 outputdir = $OUTDIR
 exampledirs = $SRCDIR/examples \
               $SRCDIR/snippets
-indexes +=    $QT_INSTALL_DOCS/qtwidgets/qtwidgets.index \
-              $QT_INSTALL_DOCS/qtcore/qtcore.index \
-              $QT_INSTALL_DOCS/qtqml/qtqml.index \
-              $QT_INSTALL_DOCS/qtquick/qtquick.index \
-              $QT_INSTALL_DOCS/qmake/qmake.index \
-              $QT_INSTALL_DOCS/qtdesigner/qtdesigner.index \
-              $QT_INSTALL_DOCS/qtdoc/qtdoc.index \
-              $QT_INSTALL_DOCS/qtgui/qtgui.index \
-              $QT_INSTALL_DOCS/qthelp/qthelp.index \
-              $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index \
-              $QT_INSTALL_DOCS/qtquicklayouts/qtquicklayouts.index \
-              $QT_INSTALL_DOCS/qtlinguist/qtlinguist.index \
-              $QT_INSTALL_DOCS/qtscript/qtscript.index \
-              $QT_INSTALL_DOCS/qtsensors/qtsensors.index \
-              $QT_INSTALL_DOCS/qtuitools/qtuitools.index \
-              $QT_INSTALL_DOCS/qtwebkit/qtwebkit.index \
-              $QT_INSTALL_DOCS/qtxml/qtxml.index
+indexes +=    $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \
+              $QDOC_INDEX_DIR/qtcore/qtcore.index \
+              $QDOC_INDEX_DIR/qtqml/qtqml.index \
+              $QDOC_INDEX_DIR/qtquick/qtquick.index \
+              $QDOC_INDEX_DIR/qmake/qmake.index \
+              $QDOC_INDEX_DIR/qtdesigner/qtdesigner.index \
+              $QDOC_INDEX_DIR/qtdoc/qtdoc.index \
+              $QDOC_INDEX_DIR/qtgui/qtgui.index \
+              $QDOC_INDEX_DIR/qthelp/qthelp.index \
+              $QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \
+              $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \
+              $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \
+              $QDOC_INDEX_DIR/qtscript/qtscript.index \
+              $QDOC_INDEX_DIR/qtsensors/qtsensors.index \
+              $QDOC_INDEX_DIR/qtuitools/qtuitools.index \
+              $QDOC_INDEX_DIR/qtwebkit/qtwebkit.index \
+              $QDOC_INDEX_DIR/qtxml/qtxml.index
 
 include(macros.qdocconf)
 include(qt-cpp-ignore.qdocconf)

doc/doc.pri

 greaterThan(QT_MAJOR_VERSION, 4) {
     HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) -platform minimal
     QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc)
+    QDOC_GLOBAL = QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS/src] QDOC_INDEX_DIR=$$[QT_INSTALL_DOCS]
     COMPAT =
 } else {
     HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator)
     QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3)
+    QDOC_GLOBAL = QDOC_INDEX_DIR=dummy   # this will be ignored. we don't link qt4 docs any more.
     COMPAT = -qt4
 }
 
@@ -23,7 +25,7 @@ defineReplace(cmdEnv) {
 }
 
 defineReplace(qdoc) {
-    return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QTC_LICENSE_TYPE=$$LICENSE_TYPE QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN")
+    return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QTC_LICENSE_TYPE=$$LICENSE_TYPE $$QDOC_GLOBAL) $$QDOC_BIN")
 }
 
 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp

src/plugins/beautifier/beautifierplugin.cpp

@@ -123,7 +123,8 @@ QString BeautifierPlugin::format(const QString &text, QStringList command, const
 
     // Save text to temporary file
     QFileInfo fi(fileName);
-    Utils::TempFileSaver sourceFile(QLatin1String("qtc_beautifier_XXXXXXXX.") + fi.suffix());
+    Utils::TempFileSaver sourceFile(fi.absolutePath() + QLatin1String("/qtc_beautifier_XXXXXXXX.")
+                                    + fi.suffix());
     sourceFile.setAutoRemove(true);
     sourceFile.write(text.toUtf8());
     if (!sourceFile.finalize()) {

src/plugins/git/gerrit/gerritoptionspage.cpp

@@ -108,6 +108,7 @@ GerritOptionsWidget::GerritOptionsWidget(QWidget *parent)
     "Determines the protocol used to form a URL in case\n"
     "\"canonicalWebUrl\" is not configured in the file\n"
     "\"gerrit.config\"."));
+    setTabOrder(m_sshChooser, m_portSpinBox);
 }
 
 GerritParameters GerritOptionsWidget::parameters() const

src/plugins/qnx/blackberryconfigurationmanager.cpp

@@ -258,6 +258,19 @@ void BlackBerryConfigurationManager::emitSettingsChanged()
     emit settingsChanged();
 }
 
+#ifdef WITH_TESTS
+void BlackBerryConfigurationManager::initUnitTest()
+{
+    foreach (BlackBerryApiLevelConfiguration *apiLevel, m_apiLevels)
+        removeApiLevel(apiLevel);
+
+    foreach (BlackBerryRuntimeConfiguration *runtime, m_runtimes)
+        removeRuntime(runtime);
+
+    m_defaultConfiguration = 0;
+}
+#endif
+
 void BlackBerryConfigurationManager::setKitsAutoDetectionSource()
 {
     foreach (Kit *kit, KitManager::kits()) {

src/plugins/qnx/blackberryconfigurationmanager.h

@@ -87,6 +87,10 @@ public:
 
     void emitSettingsChanged();
 
+#ifdef WITH_TESTS
+    void initUnitTest();
+#endif
+
 public slots:
     void loadSettings();
     void saveSettings();

src/plugins/qnx/qnxplugin.cpp

@@ -488,6 +488,7 @@ void QnxPlugin::testConfigurationManager_data()
 void QnxPlugin::testConfigurationManager()
 {
     BlackBerryConfigurationManager *manager = BlackBerryConfigurationManager::instance();
+    manager->initUnitTest();
 
     QCOMPARE(manager->apiLevels().count(), 0);
     QCOMPARE(manager->activeApiLevels().count(), 0);

src/plugins/qtsupport/baseqtversion.cpp

@@ -721,6 +721,7 @@ QString BaseQtVersion::findQtBinary(Binaries binary) const
         else
             possibleCommands << QLatin1String("qmlscene");
     }
+        break;
     case QmlViewer: {
         if (HostOsInfo::isWindowsHost())
             possibleCommands << QLatin1String("qmlviewer.exe");

src/plugins/qtsupport/desktopqtversion.cpp

@@ -67,10 +67,12 @@ QString DesktopQtVersion::type() const
 QStringList DesktopQtVersion::warningReason() const
 {
     QStringList ret = BaseQtVersion::warningReason();
-    if (qtVersion() >= QtVersionNumber(5, 0, 0) && qmlsceneCommand().isEmpty())
-        ret << QCoreApplication::translate("QtVersion", "No qmlscene installed.");
-    if (qtVersion() >= QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty())
+    if (qtVersion() >= QtVersionNumber(5, 0, 0)) {
+        if (qmlsceneCommand().isEmpty())
+            ret << QCoreApplication::translate("QtVersion", "No qmlscene installed.");
+    } else if (qtVersion() >= QtVersionNumber(4, 7, 0) && qmlviewerCommand().isEmpty()) {
         ret << QCoreApplication::translate("QtVersion", "No qmlviewer installed.");
+    }
     return ret;
 }
 

tests/system/README

@@ -18,7 +18,7 @@ Fourth - you'll have to provide some additional repositories (and for the hookin
 These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on).
 You can also just provide them inside a different folder and specify the folder with the environment variable SYSTEST_SRCPATH.
 This folder must contain the following:
- * a QtCreator repository (or source copy) of tag v2.5.0 named 'creator'
+ * a QtCreator repository (or source copy) of tag v3.1.0 named 'creator' including the submodule src/shared/qbs
  * a subfolder called 'creator-test-data'
  * a speedcrunch 0.11 repository (or source copy) inside 'creator-test-data' named 'speedcrunch'
  * additional Squish versions for hooking into subprocesses inside different folders inside 'creator-test-data' following the information below

tests/system/objects.map

@@ -81,7 +81,10 @@
 :Form.Startup_QGroupBox	{container=':qt_tabwidget_stackedwidget.Form_QWidget' name='startupGroupBox' title='Startup' type='QGroupBox' visible='1'}
 :FormEditorStack.CheckBox_QCheckBox	{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack' name='checkBox' text='CheckBox' type='QCheckBox' visible='1'}
 :FormEditorStack.PushButton_QPushButton	{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack' name='pushButton' text='PushButton' type='QPushButton' visible='1'}
+:FormEditorStack.__qt__passive_editor_QLineEdit	{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack' name='__qt__passive_editor' type='QLineEdit' visible='1'}
 :FormEditorStack.centralWidget_QDesignerWidget	{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack' name='centralWidget' type='QDesignerWidget' visible='1'}
+:FormEditorStack.comboBox_QComboBox	{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack' name='comboBox' type='QComboBox' visible='1'}
+:FormEditorStack.menuBar_QDesignerMenuBar	{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack' name='menuBar' type='QDesignerMenuBar' visible='1'}
 :FormEditorStack_qdesigner_internal::FormWindow	{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack' type='qdesigner_internal::FormWindow' unnamed='1' visible='1'}
 :FormEditorStack_qdesigner_internal::PropertyLineEdit	{container=':*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack' type='qdesigner_internal::PropertyLineEdit' unnamed='1' visible='1'}
 :Generator:_QComboBox	{buddy=':CMake Wizard.Generator:_QLabel' type='QComboBox' unnamed='1' visible='1'}

tests/system/shared/build_utils.py

@@ -43,8 +43,9 @@ def checkLastBuild(expectedToFail=False, createTasksFileOnError=True):
     ensureChecked(":Qt Creator_Issues_Core::Internal::OutputPaneToggleButton")
     model = waitForObject(":Qt Creator.Issues_QListView").model()
     buildIssues = dumpBuildIssues(model)
-    errors = len(filter(lambda i: i[5] == "1", buildIssues))
-    warnings = len(filter(lambda i: i[5] == "2", buildIssues))
+    types = map(lambda i: i[5], buildIssues)
+    errors = types.count("1")
+    warnings = types.count("2")
     gotErrors = errors != 0
     if not (gotErrors ^ expectedToFail):
         test.passes("Errors: %s | Warnings: %s" % (errors, warnings))

tests/system/shared/editor_utils.py

@@ -406,7 +406,7 @@ def replaceLine(fileSpec, oldLine, newLine):
     if openDocumentPlaceCursor(fileSpec, oldLine) == None:
         return False
     editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
-    for i in range(len(oldLine)):
+    for _ in oldLine:
         type(editor, "<Backspace>")
     type(editor, newLine)
     return True

tests/system/suite_APTW/tst_APTW03/test.py

@@ -105,6 +105,7 @@ def main():
             editor = getEditorForFileSuffix("%s.h" % className.lower())
             oldContent = str(editor.plainText)
             placeCursorToLine(editor, "class %s.*" % className, True)
+            snooze(1) # avoid timing issue with the parser
             invokeContextMenuItem(editor, "Refactor", "Insert Virtual Functions of Base Classes")
             handleInsertVirtualFunctions(["keys() const = 0 : QStringList",
                                           "create(const QString &, const QString &) = 0 : QObject *"])

tests/system/suite_debugger/tst_qml_locals/Tree.py

@@ -79,7 +79,7 @@ class Tree:
     def countChildOccurrences(self, name):
         if not self.__children__:
             return 0
-        return len(filter(lambda x: x.getName() == name, self.__children__))
+        return map(lambda x: x.getName(), self.__children__).count(name)
 
     # internal functions
     def __repr__(self):

tests/system/suite_editors/shared/testdata/files.tsv

 "filename"
 "creator/README"
 "creator/qtcreator.pri"
-"creator/doc/snippets/qml/list-of-transitions.qml"
+"creator/tests/manual/qml/testfiles_quick2/views.qml"
 "creator/share/qtcreator/glsl/glsl_120.frag"
-"creator/tests/manual/cplusplus-frontend/conf.c++"
+"creator/tests/system/suite_editors/shared/testdata/main.c++"
 "creator/src/plugins/coreplugin/basefilewizard.cpp"
 "creator/src/plugins/coreplugin/basefilewizard.h"
 "creator/tests/system/suite_debugger/tst_simple_debug/test.py"

tests/system/suite_general/suite.conf

@@ -7,6 +7,6 @@ HOOK_SUB_PROCESSES=false
 IMPLICITAUTSTART=0
 LANGUAGE=Python
 OBJECTMAP=../objects.map
-TEST_CASES=tst_build_speedcrunch tst_cmake_speedcrunch tst_create_proj_wizard tst_default_settings tst_installed_languages tst_openqt_creator tst_rename_file tst_save_before_build tst_session_handling
+TEST_CASES=tst_build_speedcrunch tst_cmake_speedcrunch tst_create_proj_wizard tst_default_settings tst_installed_languages tst_openqt_creator tst_rename_file tst_save_before_build tst_session_handling tst_tasks_handling
 VERSION=2
 WRAPPERS=Qt

tests/system/suite_general/tst_cmake_speedcrunch/test.py

@@ -48,6 +48,8 @@ def main():
         invokeMenuItem("File", "Exit")
         return
     progressBarWait(30000)
+    naviTreeView = "{column='0' container=':Qt Creator_Utils::NavigationTreeView' text~='%s' type='QModelIndex'}"
+    compareProjectTree(naviTreeView % "speedcrunch( \[\S+\])?", "projecttree_speedcrunch.tsv")
 
     # Invoke a rebuild of the application
     invokeMenuItem("Build", "Rebuild All")

tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch.tsv

+"text"	"nestinglevel"
+"cmake_uninstall.cmake.in"	"0"
+"CMakeLists.txt"	"0"
+"SourceFiles.cmake"	"0"
+"core"	"0"
+"book.cpp"	"1"
+"book.h"	"1"
+"constants.cpp"	"1"
+"constants.h"	"1"
+"evaluator.cpp"	"1"
+"evaluator.h"	"1"
+"functions.cpp"	"1"
+"functions.h"	"1"
+"numberformatter.cpp"	"1"
+"numberformatter.h"	"1"
+"settings.cpp"	"1"
+"settings.h"	"1"
+"gui"	"0"
+"aboutbox.cpp"	"1"
+"aboutbox.h"	"1"
+"application.cpp"	"1"
+"application.h"	"1"
+"autohidelabel.cpp"	"1"
+"autohidelabel.h"	"1"
+"bookdock.cpp"	"1"
+"bookdock.h"	"1"
+"constantsdock.cpp"	"1"
+"constantsdock.h"	"1"
+"constantswidget.cpp"	"1"
+"constantswidget.h"	"1"
+"editor.cpp"	"1"
+"editor.h"	"1"
+"functionsdock.cpp"	"1"
+"functionsdock.h"	"1"
+"functionswidget.cpp"	"1"
+"functionswidget.h"	"1"
+"historydock.cpp"	"1"
+"historydock.h"	"1"
+"historywidget.cpp"	"1"
+"historywidget.h"	"1"
+"mainwindow.cpp"	"1"
+"mainwindow.h"	"1"
+"resultdisplay.cpp"	"1"
+"resultdisplay.h"	"1"
+"syntaxhighlighter.cpp"	"1"
+"syntaxhighlighter.h"	"1"
+"tipwidget.cpp"	"1"
+"tipwidget.h"	"1"
+"variablelistwidget.cpp"	"1"
+"variablelistwidget.h"	"1"
+"variablesdock.cpp"	"1"
+"variablesdock.h"	"1"
+"math"	"0"
+"floatcommon.c"	"1"
+"floatcommon.h"	"1"
+"floatconst.c"	"1"
+"floatconst.h"	"1"
+"floatconvert.c"	"1"
+"floatconvert.h"	"1"
+"floaterf.c"	"1"
+"floaterf.h"	"1"
+"floatexp.c"	"1"
+"floatexp.h"	"1"
+"floatgamma.c"	"1"
+"floatgamma.h"	"1"
+"floathmath.c"	"1"
+"floathmath.h"	"1"
+"floatio.c"	"1"
+"floatio.h"	"1"
+"floatipower.c"	"1"
+"floatipower.h"	"1"
+"floatlog.c"	"1"
+"floatlog.h"	"1"
+"floatlogic.c"	"1"
+"floatlogic.h"	"1"
+"floatlong.c"	"1"
+"floatlong.h"	"1"
+"floatnum.c"	"1"
+"floatnum.h"	"1"
+"floatpower.c"	"1"
+"floatpower.h"	"1"
+"floatseries.c"	"1"
+"floatseries.h"	"1"
+"floattrig.c"	"1"
+"floattrig.h"	"1"
+"hmath.cpp"	"1"
+"hmath.h"	"1"
+"number.c"	"1"
+"number.h"	"1"
+"resources"	"0"
+"speedcrunch.qrc"	"1"
+"tests"	"0"
+"testevaluator.cpp"	"1"
+"testfloatnum.c"	"1"
+"testhmath.cpp"	"1"
+"thirdparty"	"0"
+"binreloc.c"	"1"
+"binreloc.h"	"1"
+"main.cpp"	"0"