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"

(cherry picked from commit 5a13d42e)

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"

Summary:
Add an option to allow the user to choose whether or not to display
PDF files opened from web pages using WebEngine.

This doesn't affect PDF files not opened from web pages (for example, files
opened from Dolphin Part).

The default is NOT to use the internal viewer.

The option is at the bottom of the Miscellaneous section of the Web Behavior
page in the configuration dialog. Maybe it should be made more visible.

Test Plan:
go to a web page with a link to a PDF file and click on the link:
with the option disabled Konqueror opens the PDF using a KPart; with the option
enabled, it opens it in the same WebEnginePart.

Reviewers: dfaure

Reviewed By: dfaure

Differential Revision: https://phabricator.kde.org/D25131

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"

Ctrl-LMB or MMB over a link should open the link in a new tab.
Therefore, do not put up the message box to prompt the user;
just open the new tab as requested.

Differential Revision: https://phabricator.kde.org/D24195

Summary:
Drop setOpaqueResize() call in konqframecontainer, let the style use
its defaults.

Remove some spurious #include's

Don't setFont() on widgets, let the widget/style handle it

Reviewers: dfaure, stefanocrocco

Reviewed By: dfaure

Subscribers: ognarb

Maniphest Tasks: T11559

Differential Revision: https://phabricator.kde.org/D24791

Test Plan: The code compiles

Reviewers: dfaure, stefanocrocco

Reviewed By: dfaure

Maniphest Tasks: T11559

Differential Revision: https://phabricator.kde.org/D24790

Summary:
Tests pass except for konqviewmgrtest, konqhtmltest and konqviewtes, but
they fail on master too.

Reviewers: dfaure, stefanocrocco, vkrause

Reviewed By: vkrause

Maniphest Tasks: T11559

Differential Revision: https://phabricator.kde.org/D24787

Test Plan: The code compiles

Reviewers: dfaure, stefanocrocco, vkrause

Reviewed By: vkrause

Maniphest Tasks: T11559

Differential Revision: https://phabricator.kde.org/D24775

Test Plan: It compiles and konqueror still loads

Reviewers: dfaure, stefanocrocco, vkrause

Reviewed By: vkrause

Maniphest Tasks: T11559

Differential Revision: https://phabricator.kde.org/D24788

The buttons work again now.

When compiling Konqueror on versions of Qt before 5.12, the
WebEnginePartHtmlEmbedder class is needed to embed local contents in pages
generated by...

Summary:
...WebEnginePartKIOHandler (for example, for the man protocol). The
corresponding source file is added to the the list of source files only if the
Qt version is less than 5.12. However, an extra command in CMakeFiles.txt caused
the file not to be added and the compilation to fail.

Test Plan:
compile Konqueror with Qt older than 5.12.0: the compilation now
completes successfully.

Reviewers: dfaure

Reviewed By: dfaure

Differential Revision: https://phabricator.kde.org/D22736

(cherry picked from commit f9bc950d)

QIcon::fromTheme() is still needed.  Simplify style lookup of
PM_MessageBoxIconSize, no need for a QStyleOption or widget.

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"

Summary: That now only leaves the about page still depending on KHtml here.

Reviewers: dfaure, stefanocrocco

Reviewed By: dfaure

Maniphest Tasks: T11543

Differential Revision: https://phabricator.kde.org/D24092

Summary:
This depends on KHTML-only API for executing JavaScript in the site
context.

This concludes the removal of KHTML-only plugins.

Reviewers: dfaure, stefanocrocco

Reviewed By: dfaure

Subscribers: kde-doc-english

Tags: #documentation

Differential Revision: https://phabricator.kde.org/D24027

Summary: Only works with KHTML and depends on DOM API access.

Reviewers: dfaure, stefanocrocco

Reviewed By: dfaure

Differential Revision: https://phabricator.kde.org/D23999

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"