From bfd8c5d9eeeb2c0a1941825976442d724c9e0a9b Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 11 Jun 2019 18:14:07 +0200 Subject: [PATCH 1/3] Squish: Update tst_HELP04 Task-number: QTBUG-67737 Change-Id: I4808ddccbe4e83d42d24f17a80485b5464822825 Reviewed-by: Christian Stenger --- tests/system/suite_HELP/tst_HELP04/test.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py index 1626e5d9b8d..8a3049c173a 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, "") 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) From f3ea8e34de6d6a8e175aee51de16c16074f8107c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 13 Jun 2019 11:44:57 +0200 Subject: [PATCH 2/3] ProjectTree: Save state of "Hide Empty Directories" filter Change-Id: Iafd7248242e95dc0d5205649747f46d98e05873d Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/projectmodels.cpp | 5 +++++ src/plugins/projectexplorer/projectmodels.h | 1 + src/plugins/projectexplorer/projecttreewidget.cpp | 7 +++++++ src/plugins/projectexplorer/projecttreewidget.h | 1 + 4 files changed, 14 insertions(+) diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index 49a9258f619..d69d9aad6a3 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -467,6 +467,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 952fc096518..e406360f344 100644 --- a/src/plugins/projectexplorer/projectmodels.h +++ b/src/plugins/projectexplorer/projectmodels.h @@ -74,6 +74,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 641c1de40e4..af4334a21e1 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -552,6 +552,11 @@ bool ProjectTreeWidget::generatedFilesFilter() return m_model->generatedFilesFilterEnabled(); } +bool ProjectTreeWidget::trimEmptyDirectoriesFilter() +{ + return m_model->trimEmptyDirectoriesEnabled(); +} + bool ProjectTreeWidget::projectFilter() { return m_model->projectFilterEnabled(); @@ -594,6 +599,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()); } @@ -604,5 +610,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 fb2abfc7026..6de41b0adf1 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); From 66dc83139821a978cf889ffb3a33a3f0fb11e6b0 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 13 Jun 2019 11:43:12 +0200 Subject: [PATCH 3/3] CMake: Do not QTC_ASSERT when Qml support is disabled Change-Id: Ifb84aeb252053e1e6d856650d6ec54c27d589fa0 Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index ec8e0d076d5..a9d4d76b964 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -311,9 +311,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 =