Merge branch 'Applications/18.12'

3 files changed, 2 insertions, 3 deletions

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index b2bb5c896..91fc7cfd8 100644
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -331,8 +331,8 @@ void DolphinTabPage::slotViewActivated()
                 this, &DolphinTabPage::slotViewUrlRedirection);
     }
 
-    emit activeViewUrlChanged(activeViewContainer()->url());
     emit activeViewChanged(activeViewContainer());
+    emit activeViewUrlChanged(activeViewContainer()->url());
 }
 
 void DolphinTabPage::slotViewUrlRedirection(const QUrl& oldUrl, const QUrl& newUrl)
diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 0e9aef71e..41184e119 100644
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -129,7 +129,7 @@ KBalooRolesProvider::KBalooRolesProvider() :
         { "width",         "width" },
         { "height",        "height" },
         { "imageDateTime",   "imageDateTime"},
-        { "nexif.orientation", "orientation", },
+        { "imageOrientation", "orientation", },
         { "artist",     "artist" },
         { "genre",	"genre"  },
         { "album",    "album" },
diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp
index d7ff1fb54..9cc6b84e8 100644
--- a/src/tests/dolphinmainwindowtest.cpp
+++ b/src/tests/dolphinmainwindowtest.cpp
@@ -203,7 +203,6 @@ void DolphinMainWindowTest::testUpdateWindowTitleAfterChangingSplitView()
 
     // Activate back the left view and check whether the old title gets restored.
     leftViewContainer->setActive(true);
-    QEXPECT_FAIL("", "Bug #402641", Continue);
     QCOMPARE(m_mainWindow->windowTitle(), oldTitle);
 }