summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-10-20 12:23:06 +0200
committerEike Ziller <eike.ziller@qt.io>2020-10-21 10:39:30 +0000
commitb5732298335e74d8d84b4768de863c5f7d218415 (patch)
tree56414e7c855fc15072ed927b73799c65c33254a3
parentba97b2db1645d4c45cd937ab9919b7b1c34b7db9 (diff)
Fix compilation with upstream changes
Change-Id: Ic0b6731339b84005c8d13ffa09793c5786ab1038 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
-rw-r--r--plugins/fossil/CMakeLists.txt7
-rw-r--r--plugins/fossil/fossilplugin.cpp2
2 files changed, 7 insertions, 2 deletions
diff --git a/plugins/fossil/CMakeLists.txt b/plugins/fossil/CMakeLists.txt
index af91d14..6bcd629 100644
--- a/plugins/fossil/CMakeLists.txt
+++ b/plugins/fossil/CMakeLists.txt
@@ -1,5 +1,10 @@
+if (WITH_TESTS)
+ set(QT_TEST_COMPONENT Test)
+ set(IMPLICIT_DEPENDS Qt5::Test)
+endif()
+
find_package(QtCreator COMPONENTS Core TextEditor ProjectExplorer VcsBase REQUIRED)
-find_package(Qt5 COMPONENTS Widgets REQUIRED)
+find_package(Qt5 COMPONENTS Widgets ${QT_TEST_COMPONENT} REQUIRED)
add_qtc_plugin(Fossil
PLUGIN_DEPENDS
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp
index 691b50f..09e4357 100644
--- a/plugins/fossil/fossilplugin.cpp
+++ b/plugins/fossil/fossilplugin.cpp
@@ -802,7 +802,7 @@ void FossilPluginPrivate::commitFromEditor()
// Close the submit editor
m_submitActionTriggered = true;
QTC_ASSERT(submitEditor(), return);
- Core::EditorManager::closeDocument(submitEditor()->document());
+ Core::EditorManager::closeDocuments({submitEditor()->document()});
}
bool FossilPluginPrivate::submitEditorAboutToClose()