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"

Replaced QFontMetrics::horizontalAdvance() method by QFontMetrics::boundingRect().width()

See merge request kde/rocs!22

replaced a function by another function that does the same job in this case but works in Qt < 5.11 too

Ford-Fulkerson maximum flow algorithm implemented as an example script.

See merge request kde/rocs!21

BUG: 415081

GIT_SILENT

Summary: It's not needed

Test Plan: builds, rocs opens

Reviewers: #kde_edu, tcanabrava, aacid

Reviewed By: aacid

Subscribers: apol, kde-edu

Tags: #kde_edu

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

There is no need to pull-in a fully fledged web browser for just
displaying a few HTML pages. QTextBrowser already manages this, as long
as only a basic set of HTML and CSS is used.

sidedockwidget: Fix on the exclusive button group of the toolbar

Closes #6

See merge request kde/rocs!17

Fix Redundant Append

See merge request kde/rocs!13