GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This reverts commit a69162a9.

It seems that this causes issues with links to non-html files. For
example:
- open a web page
- from that page, middle click on a link to another web page to open it
  in another tab
- from the second page, middle click on a link to a PDF file

What should happen is that the PDF file is displayed in a third tab
while the first two tabs remain unchanged. Instead, with original commit
the PDF file is displayed not only in the third tab but also in the
first one.

When opening a page in a new tab by middle-clicking a link, focus wasn't
moved to the new page but remained in the location bar. This happens
because the createNewWindow signal is emitted by
NewWindowPage::acceptNavigationRequest using an empty URL rather than
the true URL. To fix this, the real URL is passed to the createNewWindow signal.

GIT_SILENT

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Because the error page shows an explanation, provided by
KIO::rawErrorDetail(), which gives useful troubleshooting
information for this specific problem.  Previously the error
given would have been "Improperly Formatted URL" which is
misleading.

For example, "konqueror --part khtml foo".  This passes QUrl("foo"),
a valid but relative URL with no scheme, to KonqFeedIcon::feedFound().
This then asserts when calling KProtocolInfo::protocolClass() for the
blank scheme.

Note that the test case only works with KHTML, and will not reach this
point (an assert will have already happened within KIO) unless the fix
in frameworks/kio!264 is
implemented.

CCBUG:393496

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Currently there are three possible behaviours:
- duplicate the current view. This is the previous behaviour and remains
  the default one
- have the new view display the start page
- duplicate the current view if it displays a local file and show the
  start page otherwise

The reason for this change is that duplicating a web page requires time
because the page needs to be fetched again and, at least in theory, it
could have side effects.