From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sun, 5 May 2019 14:02:46 +0000 (+0200)
Subject: Merge branch 'Applications/19.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f3a86bf29e9165bbe2861c0af5e537d6d6f80854?hp=4f232fb82f236def4947ac48dee8326aa32615cb

Merge branch 'Applications/19.04'
---

diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp
index fac0931a6..4ed4945b2 100644
--- 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);