Merge remote-tracking branch 'origin/4.3'

Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b

3 files changed, 288 insertions, 2 deletions

diff --git a/tests/system/suite_editors/tst_generic_highlighter/test.py b/tests/system/suite_editors/tst_generic_highlighter/test.py
index 8e249df54e..d607b06982 100644
--- a/tests/system/suite_editors/tst_generic_highlighter/test.py
+++ b/tests/system/suite_editors/tst_generic_highlighter/test.py
@@ -131,7 +131,8 @@ def addHighlighterDefinition(language):
             clickItem(table, "%d/0" % row, 5, 5, 0, Qt.LeftButton)
             clickButton("{name='downloadButton' text='Download Selected Definitions' "
                         "type='QPushButton' visible='1'}")
-            # downloading happens asynchronously
+            # downloading happens asynchronously but may take a little time
+            progressBarWait(10000)
             languageFile = os.path.join(tmpSettingsDir, "QtProject", "qtcreator",
                                         "generic-highlighter", "%s.xml"
                                         % language.lower().replace(" ", "-"))
diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/test.py b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
index bbeccf41c8..6801d7c783 100644
--- a/tests/system/suite_general/tst_cmake_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
@@ -62,7 +62,11 @@ def main():
         return
     progressBarWait(30000)
     naviTreeView = "{column='0' container=':Qt Creator_Utils::NavigationTreeView' text~='%s' type='QModelIndex'}"
-    compareProjectTree(naviTreeView % "speedcrunch( \[\S+\])?", "projecttree_speedcrunch.tsv")
+    if cmakeSupportsServerMode():
+        treeFile = "projecttree_speedcrunch_server.tsv"
+    else:
+        treeFile = "projecttree_speedcrunch.tsv"
+    compareProjectTree(naviTreeView % "speedcrunch( \[\S+\])?", treeFile)
 
     if not cmakeSupportsServerMode() and JIRA.isBugStillOpen(18290):
         test.xfail("Building with cmake in Tealeafreader mode may fail", "QTCREATORBUG-18290")
diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch_server.tsv b/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch_server.tsv
new file mode 100644
index 0000000000..fef18389cf
--- /dev/null
+++ b/tests/system/suite_general/tst_cmake_speedcrunch/testdata/projecttree_speedcrunch_server.tsv
@@ -0,0 +1,281 @@
+"text"	"nestinglevel"
+"CMakeLists.txt"	"0"
+"speedcrunch"	"0"
+"confclean"	"0"
+"<Build Directory>"	"1"
+"CMakeFiles"	"2"
+"confclean"	"3"
+"confclean.rule"	"3"
+"speedcrunch"	"0"
+"<Source Directory>"	"1"
+"core"	"2"
+"book.cpp"	"3"
+"constants.cpp"	"3"
+"evaluator.cpp"	"3"
+"functions.cpp"	"3"
+"numberformatter.cpp"	"3"
+"settings.cpp"	"3"
+"gui"	"2"
+"aboutbox.cpp"	"3"
+"application.cpp"	"3"
+"autohidelabel.cpp"	"3"
+"bookdock.cpp"	"3"
+"constantsdock.cpp"	"3"
+"constantswidget.cpp"	"3"
+"editor.cpp"	"3"
+"functionsdock.cpp"	"3"
+"functionswidget.cpp"	"3"
+"historydock.cpp"	"3"
+"historywidget.cpp"	"3"
+"mainwindow.cpp"	"3"
+"resultdisplay.cpp"	"3"
+"syntaxhighlighter.cpp"	"3"
+"tipwidget.cpp"	"3"
+"variablelistwidget.cpp"	"3"
+"variablesdock.cpp"	"3"
+"math"	"2"
+"floatcommon.c"	"3"
+"floatconst.c"	"3"
+"floatconvert.c"	"3"
+"floaterf.c"	"3"
+"floatexp.c"	"3"
+"floatgamma.c"	"3"
+"floathmath.c"	"3"
+"floatio.c"	"3"
+"floatipower.c"	"3"
+"floatlog.c"	"3"
+"floatlogic.c"	"3"
+"floatlong.c"	"3"
+"floatnum.c"	"3"
+"floatpower.c"	"3"
+"floatseries.c"	"3"
+"floattrig.c"	"3"
+"hmath.cpp"	"3"
+"number.c"	"3"
+"resources"	"2"
+"speedcrunch.qrc"	"3"
+"/"	"4"
+"locale"	"5"
+"ar_JO.qm"	"6"
+"ca_ES.qm"	"6"
+"cs_CZ.qm"	"6"
+"de_DE.qm"	"6"
+"en_GB.qm"	"6"
+"en_US.qm"	"6"
+"es_AR.qm"	"6"
+"es_ES.qm"	"6"
+"et_EE.qm"	"6"
+"eu_ES.qm"	"6"
+"fi_FI.qm"	"6"
+"fr_FR.qm"	"6"
+"he_IL.qm"	"6"
+"hu_HU.qm"	"6"
+"id_ID.qm"	"6"
+"it_IT.qm"	"6"
+"ja_JP.qm"	"6"
+"ko_KR.qm"	"6"
+"lv_LV.qm"	"6"
+"nb_NO.qm"	"6"
+"nl_NL.qm"	"6"
+"pl_PL.qm"	"6"
+"pt_BR.qm"	"6"
+"pt_PT.qm"	"6"
+"ro_RO.qm"	"6"
+"ru_RU.qm"	"6"
+"sv_SE.qm"	"6"
+"tr_TR.qm"	"6"
+"uz_UZ.qm"	"6"
+"vi_VN.qm"	"6"
+"zh_CN.qm"	"6"
+"speedcrunch.png"	"5"
+"speedcrunch.rc"	"3"
+"thirdparty"	"2"
+"binreloc.c"	"3"
+"main.cpp"	"2"
+"<Build Directory>"	"1"
+"core"	"2"
+"moc_book.cxx"	"3"
+"moc_book.cxx.rule"	"3"
+"moc_constants.cxx"	"3"
+"moc_constants.cxx.rule"	"3"
+"moc_evaluator.cxx"	"3"
+"moc_evaluator.cxx.rule"	"3"
+"moc_functions.cxx"	"3"
+"moc_functions.cxx.rule"	"3"
+"gui"	"2"
+"moc_application.cxx"	"3"
+"moc_application.cxx.rule"	"3"
+"moc_autohidelabel.cxx"	"3"
+"moc_autohidelabel.cxx.rule"	"3"
+"moc_bookdock.cxx"	"3"
+"moc_bookdock.cxx.rule"	"3"
+"moc_constantsdock.cxx"	"3"
+"moc_constantsdock.cxx.rule"	"3"
+"moc_constantswidget.cxx"	"3"
+"moc_constantswidget.cxx.rule"	"3"
+"moc_editor.cxx"	"3"
+"moc_editor.cxx.rule"	"3"
+"moc_functionsdock.cxx"	"3"
+"moc_functionsdock.cxx.rule"	"3"
+"moc_functionswidget.cxx"	"3"
+"moc_functionswidget.cxx.rule"	"3"
+"moc_historydock.cxx"	"3"
+"moc_historydock.cxx.rule"	"3"
+"moc_historywidget.cxx"	"3"
+"moc_historywidget.cxx.rule"	"3"
+"moc_mainwindow.cxx"	"3"
+"moc_mainwindow.cxx.rule"	"3"
+"moc_resultdisplay.cxx"	"3"
+"moc_resultdisplay.cxx.rule"	"3"
+"moc_tipwidget.cxx"	"3"
+"moc_tipwidget.cxx.rule"	"3"
+"moc_variablelistwidget.cxx"	"3"
+"moc_variablelistwidget.cxx.rule"	"3"
+"moc_variablesdock.cxx"	"3"
+"moc_variablesdock.cxx.rule"	"3"
+"qrc_speedcrunch.cxx"	"2"
+"testevaluator"	"0"
+"<Source Directory>"	"1"
+"core"	"2"
+"evaluator.cpp"	"3"
+"functions.cpp"	"3"
+"settings.cpp"	"3"
+"math"	"2"
+"floatcommon.c"	"3"
+"floatconst.c"	"3"
+"floatconvert.c"	"3"
+"floaterf.c"	"3"
+"floatexp.c"	"3"
+"floatgamma.c"	"3"
+"floathmath.c"	"3"
+"floatio.c"	"3"
+"floatipower.c"	"3"
+"floatlog.c"	"3"
+"floatlogic.c"	"3"
+"floatlong.c"	"3"
+"floatnum.c"	"3"
+"floatpower.c"	"3"
+"floatseries.c"	"3"
+"floattrig.c"	"3"
+"hmath.cpp"	"3"
+"number.c"	"3"
+"tests"	"2"
+"testevaluator.cpp"	"3"
+"<Build Directory>"	"1"
+"core"	"2"
+"moc_evaluator.cxx"	"3"
+"moc_evaluator.cxx.rule"	"3"
+"moc_functions.cxx"	"3"
+"moc_functions.cxx.rule"	"3"
+"testfloatnum"	"0"
+"<Source Directory>"	"1"
+"math"	"2"
+"floatcommon.c"	"3"
+"floatconst.c"	"3"
+"floatconvert.c"	"3"
+"floaterf.c"	"3"
+"floatexp.c"	"3"
+"floatgamma.c"	"3"
+"floathmath.c"	"3"
+"floatio.c"	"3"
+"floatipower.c"	"3"
+"floatlog.c"	"3"
+"floatlogic.c"	"3"
+"floatlong.c"	"3"
+"floatnum.c"	"3"
+"floatpower.c"	"3"
+"floatseries.c"	"3"
+"floattrig.c"	"3"
+"number.c"	"3"
+"tests"	"2"
+"testfloatnum.c"	"3"
+"testhmath"	"0"
+"<Source Directory>"	"1"
+"math"	"2"
+"floatcommon.c"	"3"
+"floatconst.c"	"3"
+"floatconvert.c"	"3"
+"floaterf.c"	"3"
+"floatexp.c"	"3"
+"floatgamma.c"	"3"
+"floathmath.c"	"3"
+"floatio.c"	"3"
+"floatipower.c"	"3"
+"floatlog.c"	"3"
+"floatlogic.c"	"3"
+"floatlong.c"	"3"
+"floatnum.c"	"3"
+"floatpower.c"	"3"
+"floatseries.c"	"3"
+"floattrig.c"	"3"
+"hmath.cpp"	"3"
+"number.c"	"3"
+"tests"	"2"
+"testhmath.cpp"	"3"
+"uninstall"	"0"
+"<Build Directory>"	"1"
+"CMakeFiles"	"2"
+"uninstall"	"3"
+"uninstall.rule"	"3"
+"<Headers>"	"0"
+"core"	"1"
+"book.h"	"2"
+"constants.h"	"2"
+"errors.h"	"2"
+"evaluator.h"	"2"
+"functions.h"	"2"
+"numberformatter.h"	"2"
+"settings.h"	"2"
+"gui"	"1"
+"aboutbox.h"	"2"
+"application.h"	"2"
+"autohidelabel.h"	"2"
+"bookdock.h"	"2"
+"constantsdock.h"	"2"
+"constantswidget.h"	"2"
+"editor.h"	"2"
+"functionsdock.h"	"2"
+"functionswidget.h"	"2"
+"historydock.h"	"2"
+"historywidget.h"	"2"
+"mainwindow.h"	"2"
+"resultdisplay.h"	"2"
+"syntaxhighlighter.h"	"2"
+"tipwidget.h"	"2"
+"variablelistwidget.h"	"2"
+"variablesdock.h"	"2"
+"math"	"1"
+"floatcommon.h"	"2"
+"floatconfig.h"	"2"
+"floatconst.h"	"2"
+"floatconvert.h"	"2"
+"floaterf.h"	"2"
+"floatexp.h"	"2"
+"floatgamma.h"	"2"
+"floathmath.h"	"2"
+"floatincgamma.h"	"2"
+"floatio.h"	"2"
+"floatipower.h"	"2"
+"floatlog.h"	"2"
+"floatlogic.h"	"2"
+"floatlong.h"	"2"
+"floatnum.h"	"2"
+"floatpower.h"	"2"
+"floatseries.h"	"2"
+"floattrig.h"	"2"
+"hmath.h"	"2"
+"number.h"	"2"
+"thirdparty"	"1"
+"binreloc.h"	"2"
+"CMake Modules"	"0"
+"<Source Directory>"	"1"
+"cmake_uninstall.cmake.in"	"2"
+"SourceFiles.cmake"	"2"
+"resources"	"2"
+"speedcrunch.qrc"	"3"
+"<Build Directory>"	"1"
+"CMakeFiles"	"2"
+"feature_tests.cxx"	"3"
+"CMakeCCompiler.cmake"	"4"
+"CMakeCXXCompiler.cmake"	"4"
+"CMakeSystem.cmake"	"4"