kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/18.12'

Browse source
This commit is contained in:
Alexander Stippich 2019-01-07 21:56:40 +01:00
parent 1873e2f08f 8f051a391d
commit d099123841
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dolphintabpage.cpp
View file

@ -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)

2
src/kitemviews/private/kbaloorolesprovider.cpp
View file

@ -129,7 +129,7 @@ KBalooRolesProvider::KBalooRolesProvider() :
{ "width", "width" },
{ "height", "height" },
{ "imageDateTime", "imageDateTime"},
{ "nexif.orientation", "orientation", },
{ "imageOrientation", "orientation", },
{ "artist", "artist" },
{ "genre", "genre" },
{ "album", "album" },

1
src/tests/dolphinmainwindowtest.cpp
View file

@ -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);
}