mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-22 01:40:02 +00:00
Merge branch 'Applications/18.12'
This commit is contained in:
commit
d099123841
|
@ -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)
|
||||
|
|
|
@ -129,7 +129,7 @@ KBalooRolesProvider::KBalooRolesProvider() :
|
|||
{ "width", "width" },
|
||||
{ "height", "height" },
|
||||
{ "imageDateTime", "imageDateTime"},
|
||||
{ "nexif.orientation", "orientation", },
|
||||
{ "imageOrientation", "orientation", },
|
||||
{ "artist", "artist" },
|
||||
{ "genre", "genre" },
|
||||
{ "album", "album" },
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue