Merge remote-tracking branch 'origin/2.5'

Conflicts:
	src/libs/zeroconf/embed/DebugServices.h
	tests/system/shared/project.py

Change-Id: I990f6b87ef8570317caf705bbca465a1a01f64b2

share/qtcreator/translations/qtcreator_fr.ts

@@ -32710,17 +32710,20 @@ Details: %3</source>
     <message>
         <source>Debugging starts
 </source>
-        <translation>Début du débogage</translation>
+        <translation>Début du débogage
+</translation>
     </message>
     <message>
         <source>Debugging has failed
 </source>
-        <translation>Échec du débogage</translation>
+        <translation>Échec du débogage
+</translation>
     </message>
     <message>
         <source>Debugging has finished
 </source>
-        <translation>Fin du débogage</translation>
+        <translation>Fin du débogage
+</translation>
     </message>
     <message>
         <source>A debugging session is still in progress. Terminating the session in the current state can leave the target in an inconsistent state. Would you still like to terminate it?</source>

share/qtcreator/translations/qtcreator_ru.ts

@@ -12796,7 +12796,7 @@ QML.</translation>
     <name>Locator</name>
     <message>
         <source>Locator</source>
-        <translation>Поисковик</translation>
+        <translation>Быстрый поиск</translation>
     </message>
 </context>
 <context>
@@ -12862,8 +12862,8 @@ QML.</translation>
     <message>
         <source>Specify a short word/abbreviation that can be used to restrict completions to files from this directory tree.
 To do this, you type this shortcut and a space in the Locator entry field, and then the word to search for.</source>
-        <translation>Укажите сокращение или аббревиатуру, которая будет использоваться для ограничения дополнения до файлов из
-данного дерева каталогов. Для этого требуется ввести указанное сокращение, пробел и искомое слово в поле поисковика.</translation>
+        <translation>Укажите сокращение или аббревиатуру, которая будет использоваться для выполнения дополнения имён файлов из
+данного дерева каталогов. Для этого требуется ввести указанное сокращение, пробел и искомое слово в поле быстрого поиска.</translation>
     </message>
     <message>
         <source>Limit to prefix</source>

src/plugins/qt4projectmanager/qt4nodes.cpp

@@ -1542,7 +1542,7 @@ Qt4ProFileNode::~Qt4ProFileNode()
     m_parseFutureWatcher.waitForFinished();
     if (m_readerExact) {
         // Oh we need to clean up
-        applyEvaluate(EvalFail, true);
+        applyEvaluate(EvalAbort, true);
         m_project->decrementPendingEvaluateFutures();
     }
 }

src/plugins/qt4projectmanager/qt4nodes.h

@@ -412,7 +412,7 @@ private slots:
 
 private:
     void setupReader();
-    enum EvalResult { EvalFail, EvalPartial, EvalOk };
+    enum EvalResult { EvalAbort, EvalFail, EvalPartial, EvalOk };
     EvalResult evaluate();
     void applyEvaluate(EvalResult parseResult, bool async);
 

tests/system/shared/project.py

@@ -1,3 +1,4 @@
+import __builtin__
 import re
 
 processStarted = False
@@ -455,3 +456,40 @@ def __sortFilenamesOSDependent__(filenames):
     else:
         filenames.sort()
     return filenames
+
+def __iterateChildren__(model, parent, nestingLevel=0):
+    children = []
+    for currentIndex in [model.index(row, 0, parent) for row in range(model.rowCount(parent))]:
+        children.append([str(currentIndex.text), nestingLevel])
+        if model.hasChildren(currentIndex):
+            children.extend(__iterateChildren__(model, currentIndex, nestingLevel + 1))
+    return children
+
+# This will write the data to a file which can then be used for comparing
+def __writeProjectTreeFile__(projectTree, filename):
+    f = open(filename, "w+")
+    f.write('"text"\t"nestinglevel"\n')
+    for elem in projectTree:
+        f.write('"%s"\t"%s"\n' % (elem[0], elem[1]))
+    f.close()
+
+def __getTestData__(record):
+    return [testData.field(record, "text"),
+            __builtin__.int(testData.field(record, "nestinglevel"))]
+
+def compareProjectTree(rootObject, dataset):
+    root = waitForObject(rootObject)
+    tree = __iterateChildren__(root.model(), root)
+
+    # __writeProjectTreeFile__(tree, dataset)
+
+    for i, current in enumerate(map(__getTestData__, testData.dataset(dataset))):
+        try:
+            # Just removing everything up to the found item
+            # Writing a pass would result in truly massive logs
+            tree = tree[tree.index(current) + 1:]
+        except ValueError:
+            test.fail('Could not find "%s" with nesting level %s' % tuple(current),
+                      'Line %s in dataset' % str(i + 1))
+            return
+    test.passes("No errors found in project tree")

tests/system/suite_general/tst_openqt_creator/test.py

@@ -15,6 +15,10 @@ def main():
     # Wait for parsing to complete
     waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 300000)
 
+    naviTreeView = "{column='0' container=':Qt Creator_Utils::NavigationTreeView' text='%s' type='QModelIndex'}"
+    compareProjectTree(naviTreeView % "speedcrunch", "projecttree_speedcrunch.tsv")
+    compareProjectTree(naviTreeView % "qtcreator", "projecttree_creator.tsv")
+
     # Now check some basic lookups in the search box
     selectFromLocator(": Qlist::QList", "QList::QList")
     test.compare(wordUnderCursor(waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")), "QList")

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

@@ -0,0 +1,83 @@
+"text"	"nestinglevel"
+"speedcrunch.pro"	"0"
+"Headers"	"0"
+"core"	"1"
+"constants.h"	"2"
+"evaluator.h"	"2"
+"functions.h"	"2"
+"gui"	"1"
+"aboutbox.h"	"2"
+"application.h"	"2"
+"autohidelabel.h"	"2"
+"bookdock.h"	"2"
+"constantsdock.h"	"2"
+"constantswidget.h"	"2"
+"deletevardlg.h"	"2"
+"editor.h"	"2"
+"functionsdialog.h"	"2"
+"functionsdock.h"	"2"
+"functionswidget.h"	"2"
+"historydock.h"	"2"
+"historywidget.h"	"2"
+"insertvardlg.h"	"2"
+"keypad.h"	"2"
+"mainwindow.h"	"2"
+"resultdisplay.h"	"2"
+"tipwidget.h"	"2"
+"variablesdock.h"	"2"
+"variableswidget.h"	"2"
+"Sources"	"0"
+"core"	"1"
+"constants.cpp"	"2"
+"evaluator.cpp"	"2"
+"functions.cpp"	"2"
+"settings.cpp"	"2"
+"gui"	"1"
+"aboutbox.cpp"	"2"
+"application.cpp"	"2"
+"autohidelabel.cpp"	"2"
+"bookdock.cpp"	"2"
+"constantsdock.cpp"	"2"
+"constantswidget.cpp"	"2"
+"deletevardlg.cpp"	"2"
+"editor.cpp"	"2"
+"functionsdialog.cpp"	"2"
+"functionsdock.cpp"	"2"
+"functionswidget.cpp"	"2"
+"historydock.cpp"	"2"
+"historywidget.cpp"	"2"
+"insertvardlg.cpp"	"2"
+"keypad.cpp"	"2"
+"mainwindow.cpp"	"2"
+"resultdisplay.cpp"	"2"
+"syntaxhighlighter.cpp"	"2"
+"textedit.cpp"	"2"
+"tipwidget.cpp"	"2"
+"variablesdock.cpp"	"2"
+"variableswidget.cpp"	"2"
+"main"	"1"
+"main.cpp"	"2"
+"math"	"1"
+"floatcommon.c"	"2"
+"floatconst.c"	"2"
+"floatconvert.c"	"2"
+"floaterf.c"	"2"
+"floatexp.c"	"2"
+"floatgamma.c"	"2"
+"floathmath.c"	"2"
+"floatio.c"	"2"
+"floatipower.c"	"2"
+"floatlog.c"	"2"
+"floatlogic.c"	"2"
+"floatlong.c"	"2"
+"floatnum.c"	"2"
+"floatpower.c"	"2"
+"floatseries.c"	"2"
+"floattrig.c"	"2"
+"hmath.cpp"	"2"
+"number.c"	"2"
+"thirdparty/binreloc"	"1"
+"binreloc.c"	"2"
+"Resources"	"0"
+"resources"	"1"
+"speedcrunch.qrc"	"2"