Merge remote-tracking branch 'gerrit/4.9' into 4.10

Change-Id: I033d6baa40af45ae1eb6ed82827ff51213c832f5

6 files changed, 20 insertions, 6 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 1182b9699e..a3e7ca3c37 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -358,9 +358,8 @@ void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc)
 void CMakeProject::updateQmlJSCodeModel()
 {
     QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
-    QTC_ASSERT(modelManager, return);
 
-    if (!activeTarget() || !activeTarget()->activeBuildConfiguration())
+    if (!modelManager || !activeTarget() || !activeTarget()->activeBuildConfiguration())
         return;
 
     QmlJS::ModelManagerInterface::ProjectInfo projectInfo =
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index cfacd27ab6..c2c02b1d02 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -780,6 +780,11 @@ bool FlatModel::generatedFilesFilterEnabled()
     return m_filterGeneratedFiles;
 }
 
+bool FlatModel::trimEmptyDirectoriesEnabled()
+{
+    return m_trimEmptyDirectories;
+}
+
 Node *FlatModel::nodeForIndex(const QModelIndex &index) const
 {
     WrapperNode *flatNode = itemForIndex(index);
diff --git a/src/plugins/projectexplorer/projectmodels.h b/src/plugins/projectexplorer/projectmodels.h
index aa044fc0f0..78753bf1da 100644
--- a/src/plugins/projectexplorer/projectmodels.h
+++ b/src/plugins/projectexplorer/projectmodels.h
@@ -78,6 +78,7 @@ public:
 
     bool projectFilterEnabled();
     bool generatedFilesFilterEnabled();
+    bool trimEmptyDirectoriesEnabled();
     void setProjectFilterEnabled(bool filter);
     void setGeneratedFilesFilterEnabled(bool filter);
     void setTrimEmptyDirectories(bool filter);
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 70d3dc976a..5e4b19f8c9 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -569,6 +569,11 @@ bool ProjectTreeWidget::generatedFilesFilter()
     return m_model->generatedFilesFilterEnabled();
 }
 
+bool ProjectTreeWidget::trimEmptyDirectoriesFilter()
+{
+    return m_model->trimEmptyDirectoriesEnabled();
+}
+
 bool ProjectTreeWidget::projectFilter()
 {
     return m_model->projectFilterEnabled();
@@ -611,6 +616,7 @@ void ProjectTreeWidgetFactory::saveSettings(QSettings *settings, int position, Q
     const QString baseKey = QLatin1String("ProjectTreeWidget.") + QString::number(position);
     settings->setValue(baseKey + QLatin1String(".ProjectFilter"), ptw->projectFilter());
     settings->setValue(baseKey + QLatin1String(".GeneratedFilter"), ptw->generatedFilesFilter());
+    settings->setValue(baseKey + QLatin1String(".TrimEmptyDirsFilter"), ptw->trimEmptyDirectoriesFilter());
     settings->setValue(baseKey + QLatin1String(".SyncWithEditor"), ptw->autoSynchronization());
 }
 
@@ -621,5 +627,6 @@ void ProjectTreeWidgetFactory::restoreSettings(QSettings *settings, int position
     const QString baseKey = QLatin1String("ProjectTreeWidget.") + QString::number(position);
     ptw->setProjectFilter(settings->value(baseKey + QLatin1String(".ProjectFilter"), false).toBool());
     ptw->setGeneratedFilesFilter(settings->value(baseKey + QLatin1String(".GeneratedFilter"), true).toBool());
+    ptw->setTrimEmptyDirectories(settings->value(baseKey + QLatin1String(".TrimEmptyDirsFilter"), true).toBool());
     ptw->setAutoSynchronization(settings->value(baseKey +  QLatin1String(".SyncWithEditor"), true).toBool());
 }
diff --git a/src/plugins/projectexplorer/projecttreewidget.h b/src/plugins/projectexplorer/projecttreewidget.h
index 3ab73eeef9..c4b729f097 100644
--- a/src/plugins/projectexplorer/projecttreewidget.h
+++ b/src/plugins/projectexplorer/projecttreewidget.h
@@ -56,6 +56,7 @@ public:
     void setAutoSynchronization(bool sync);
     bool projectFilter();
     bool generatedFilesFilter();
+    bool trimEmptyDirectoriesFilter();
     QToolButton *toggleSync();
     Node *currentNode();
     void sync(ProjectExplorer::Node *node);
diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py
index 1626e5d9b8..8a3049c173 100644
--- a/tests/system/suite_HELP/tst_HELP04/test.py
+++ b/tests/system/suite_HELP/tst_HELP04/test.py
@@ -26,7 +26,7 @@
 source("../../shared/qtcreator.py")
 
 # test search in help mode and advanced search
-searchKeywordDictionary={ "abundance":True, "deplmint":False, "QODBC":True, "bld":False }
+searchKeywordDictionary = { "abundance":True, "deplmint":False, "QODBC":True, "bldx":False }
 urlDictionary = { "abundance":"qthelp://com.trolltech.qt.487/qdoc/gettingstarted-develop.html",
                   "QODBC":"qthelp://com.trolltech.qt.487/qdoc/sql-driver.html" }
 
@@ -93,7 +93,7 @@ def main():
     clickButton(waitForObject("{text='Search' type='QPushButton' unnamed='1' visible='1' "
                               "window=':Qt Creator_Core::Internal::MainWindow'}"))
     resultWidget = waitForObject(':Hits_QResultWidget', 5000)
-    if not JIRA.isBugStillOpen(67737, JIRA.Bug.QT):
+    if os.getenv("SYSTEST_BUILT_WITH_QT_5_13_1_OR_NEWER", "0") == "1":
         test.verify(waitFor("noMatch in "
                             "str(resultWidget.plainText)", 2000),
                             "Verifying if search did not match anything.")
@@ -121,9 +121,10 @@ def main():
             type(resultWidget, "<Return>")
             waitFor("__getUrl__() != url or selText != __getSelectedText__()", 20000)
             verifySelection(searchKeyword)
-            verifyUrl(urlDictionary[searchKeyword])
+            if not (searchKeyword == "QODBC" and JIRA.isBugStillOpen(10331)):
+                verifyUrl(urlDictionary[searchKeyword])
         else:
-            if not JIRA.isBugStillOpen(67737, JIRA.Bug.QT):
+            if os.getenv("SYSTEST_BUILT_WITH_QT_5_13_1_OR_NEWER", "0") == "1":
                 test.verify(waitFor("noMatch in "
                                     "str(resultWidget.plainText)", 1000),
                                     "Verifying if search did not match anything for: " + searchKeyword)