Merge branch 'Applications/19.04'

diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp
index fac0931a6c31a56b6a6beac397a2e1c9b7935950..4ed4945b2010e3bcdef5ced73623ff81364769c7 100644 (file)
--- a/src/tests/placesitemmodeltest.cpp
+++ b/src/tests/placesitemmodeltest.cpp
@@ -476,10 +476,12 @@ void PlacesItemModelTest::testDefaultViewProperties()
     QFETCH(bool, expectedPreviewShow);
     QFETCH(QList<QByteArray>, expectedVisibleRole);
 
-    // In order to test the default view properties, turn off the global view properties.
+    // In order to test the default view properties, turn off the global view properties and re-init the test to reload the model.
     GeneralSettings* settings = GeneralSettings::self();
     settings->setGlobalViewProps(false);
     settings->save();
+    cleanup();
+    init();
 
     ViewProperties properties(KFilePlacesModel::convertedUrl(url));
     QCOMPARE(properties.viewMode(), expectedViewMode);