Author: Andrius Štikonas
Revision Date: 2019-09-26 23:20:14 UTC

Merge branch '2.1'

Author: Jonathan Riddell
Revision Date: 2019-08-09 13:43:00 UTC

use an icon which exists

Author: Luca Beltrame
Revision Date: 2019-06-14 05:11:58 UTC

Use the new logging category directory with ECM >= 5.59.0

Author: Luca Beltrame
Revision Date: 2019-06-14 05:00:48 UTC

Use the new logging category directory with ECM >= 5.59.0

Author: Carl Schwan
Revision Date: 2019-03-17 19:19:04 UTC

Use ellipsis in search field

Summary: Screenshot: {F6691966}

Test Plan: Build, run and search field work as before

Reviewers: #kalzium, #vdg, yurchor

Reviewed By: yurchor

Subscribers: aacid, yurchor, ngraham, kde-edu

Tags: #kde_edu

Maniphest Tasks: T10258

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

Author: l10n daemon script
Revision Date: 2018-12-29 11:22:22 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2018-12-29 11:21:14 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2018-12-29 11:21:04 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2018-12-29 11:21:00 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2018-12-29 11:20:53 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: Luca Beltrame
Revision Date: 2018-10-12 05:00:21 UTC

Rename kscreen.categories to libkscreen.categories

Otherwise it will conflict with the file with the same name in the
kscreen repository.

Issue found by the Open Build Service.

CCMAIL: montel@kde.org

Author: Luca Beltrame
Revision Date: 2018-05-31 12:11:23 UTC

Merge branch 'Applications/18.04'

Author: Oleg Chernovskiy
Revision Date: 2018-05-30 17:59:21 UTC

Fix IPv6 connectivity

Summary:
IPv6 is supported by LibVNCServer but for compatibility reasons its
socket is backed by another file descriptor.

This commit adds tracking IPv6 listen socket in the same way we now
track IPv4 one.

Test Plan: Tested by connecting through ::1 and fe80:: addresses

Reviewers: #plasma, #kde_applications, alexeymin

Reviewed By: alexeymin

Subscribers: ltoscano, alexeymin, apol, aacid

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

Author: genstorm
Revision Date: 2018-04-21 12:35:03 UTC

Merge branch 'Applications/18.04'

Author: Andreas Sturmlechner
Revision Date: 2018-04-20 09:17:31 UTC

Merge branch 'Applications/18.04'

Author: Luca Beltrame
Revision Date: 2018-03-06 06:10:45 UTC

Fix build with Qt 5.11

Author: Luca Beltrame
Revision Date: 2018-03-06 05:59:55 UTC

Fix build with Qt 5.11

Author: Luca Beltrame
Revision Date: 2018-03-06 05:58:25 UTC

Fix build with Qt 5.11

Some includes need to be explicitly set now

Author: l10n daemon script
Revision Date: 2017-12-28 01:09:14 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2017-11-08 04:07:14 UTC

SVN_SILENT made messages (.desktop file)

Author: l10n daemon script
Revision Date: 2017-11-04 01:01:50 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2017-11-02 01:00:38 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2017-10-16 00:06:39 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2017-10-03 23:50:19 UTC

GIT_SILENT made messages (after extraction)

Author: Luigi Toscano
Revision Date: 2017-08-31 18:25:32 UTC

Merge remote-tracking branch 'origin/Applications/17.08'

Author: Oliver Sander
Revision Date: 2017-08-10 15:27:27 UTC

Print via QPrinter when rasterizing and printing annotations

When the user chooses to print with rasterization and annotations,
it is easy to print directly to a QPrinter, rather than converting
to PostScript and then using CUPS tools. The code for it was
already there, but it was hidden behind an #ifdef Q_OS_WIN.
This patch enables it for all plattforms. If nothing else,
it will make an interesting debugging tool, because it allows
to bypass the postscript & CUPS toolchain from the GUI.
This may allow to track down some of the numerous my-printer-settings-
are-getting-ignored bugs.

The previously windows-only rasterization code used printer.physicalDpiX()
as the rasterization resolution. At least on my machine this resulted
in a dpi value of 1200, which means quite a lot of memory is used.
I left the windows code untouched, but on Unix I lowered that value
to 300dpi, which is what the postscript rasterizer uses.

Incidentally, this patch does fix at least one bug for me:
Without it, my printer will happily ignore the 'print in grayscale'
button. With the patch, that button is suddenly honoured.

REVIEW: 130218

Author: Max Brazhnikov
Revision Date: 2017-08-04 15:38:55 UTC

kmix assumes volume range 1:100 for oss mixer instead of 0:100.

Summary:
See https://bugs.kde.org/344468
and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=184996

Reviewers: #freebsd, marten, adridg, ltoscano

Reviewed By: #freebsd, adridg

Subscribers: adridg, ltoscano, rakuco

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

Author: Albert Astals Cid
Revision Date: 2017-07-29 17:20:06 UTC

Merge remote-tracking branch 'origin/Applications/17.08'

Author: Heiko Becker
Revision Date: 2017-07-20 21:07:50 UTC

[cmake]: De-duplicate "else" to fix build with cmake-3.9

Otherwise it errors out with:
"CMake Error at kdeui/CMakeLists.txt:316 (else): A duplicate ELSE
command was found inside an IF block."
Also adjust the indentation to match the surrounding lines and remove
the arguments from else() and endif().

Author: Kitware Robot
Revision Date: 2017-05-19 04:01:06 UTC

CMake Nightly Date Stamp

Author: l10n daemon script
Revision Date: 2017-04-20 23:14:48 UTC

GIT_SILENT made messages (after extraction)

Author: l10n daemon script
Revision Date: 2017-04-20 23:14:31 UTC

GIT_SILENT made messages (after extraction)

Author: l10n daemon script
Revision Date: 2017-04-19 23:16:49 UTC

GIT_SILENT made messages (after extraction)

Author: Andrius Štikonas
Revision Date: 2017-04-11 15:51:41 UTC

Organization Name should match reverse DNS of desktop file.

Also desktop file was named incorrectly and didn't even match what was in
appdata file.

Author: Niels Ole Salscheider
Revision Date: 2017-01-21 08:16:09 UTC

Allow to override the share install dir

This is needed for multiarch layouts where the prefix is /usr/${host} but
where arch-independet files are installed to /usr/share.

REVIEW: 98322

Author: RJVB
Revision Date: 2017-01-15 16:58:53 UTC

C++11 requires a space between literal and identifier

Author: Mr. Anderson
Revision Date: 2017-01-02 15:06:31 UTC

Make kded happy by prepending "kded_" to the X-KDE-Library value "printmanager"

kded complains:

> found kded module "printmanager" by prepending 'kded_' to the library path, please fix your metadata.

Fix it by prepending kded_ in the corresponding file print-manager-kded/printmanager.desktop.

REVIEW: 127738

Author: l10n daemon script
Revision Date: 2016-12-19 04:39:19 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: Aurélien Gâteau
Revision Date: 2016-11-23 08:21:41 UTC

Merge branch 'bring-back-importer'

# Conflicts:
# CMakeLists.txt

Author: Chris Burel
Revision Date: 2016-10-03 21:31:14 UTC

Merge branch 'bugfix/360846'

Author: Albert Astals Cid
Revision Date: 2016-10-02 21:23:56 UTC

Merge remote-tracking branch 'origin/Applications/16.08'

Author: l10n daemon script
Revision Date: 2016-09-18 09:33:40 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: Wolfgang Bauer
Revision Date: 2016-09-14 22:02:25 UTC

Merge branch 'KDE/4.14'

Author: Elvis Angelaccio
Revision Date: 2016-08-09 15:26:10 UTC

Merge branch 'LibKGAPI/5.3'

Author: Pino Toscano
Revision Date: 2016-08-01 05:25:36 UTC

cmake: allow to disable build of plasma stuff

This makes it easy to disable the build of plasma stuff (for plasma 4,
so not much useful in a plasma 5 environment), passing
-DBUILD_plasma=OFF to cmake.

Author: Jonathan Marten
Revision Date: 2016-06-19 07:18:19 UTC

Fix location of KF5 country flag database

Author: Jonathan Marten
Revision Date: 2016-06-19 07:18:19 UTC

Fix location of KF5 country flag database

Author: Montel Laurent
Revision Date: 2016-06-18 08:06:01 UTC

Increase version

Author: Jos van den Oever
Revision Date: 2016-05-14 20:22:28 UTC

Extend regexp to allow compilation with GCC 6

Author: Jos van den Oever
Revision Date: 2016-05-14 20:21:45 UTC

Extend regexp to allow compilation with GCC 6

Author: Montel Laurent
Revision Date: 2016-05-14 07:52:47 UTC

Add Q_DECL_OVERRIDE

Author: Montel Laurent
Revision Date: 2016-05-14 07:52:47 UTC

Add Q_DECL_OVERRIDE

Author: Hein
Revision Date: 2016-05-03 06:51:04 UTC

Japanese charsets fixes.

We used to override QTextCodec::codecForLocale() by explicitly
defaulting to jis7 for jp_JP, but KCharsets/Qt5 seem to no longer
support jis7. We also used to mangle ISO-2022-JP to jis7 - which
actually is supported. So lets default to ISO-2022-JP and mangle
jis7 to ISO 2022-JP instead to keep existing configs working ...

However this showed up as a crash due to not checking for null
codecs, so let's add a check too.

BUG:362401

Author: Frederik Schwarzer
Revision Date: 2016-04-30 11:01:07 UTC

Add .gitignore file.

Author: Ben Cooksley
Revision Date: 2016-04-09 06:40:03 UTC

Let's use the CMake provided variables here, maybe it will compile

Author: Heiko Becker
Revision Date: 2016-04-05 21:04:33 UTC

Merge remote-tracking branch 'origin/Applications/16.04'

Author: Cordlandwehr-n
Revision Date: 2016-03-15 20:43:39 UTC

Link against KCrash.

Author: Julian Helfferich
Revision Date: 2016-03-14 01:31:51 UTC

Port Sound to KgSound

Port sound in KBlocksSound from Phonon to KgSound. Note that no sound
will be played (no sound played before). Re-activation of sounds will
be adressed in the future.

REVIEW: 127284

Author: Matthias Klumpp
Revision Date: 2016-02-16 23:57:44 UTC

trivial: Use cmake var to install AppStream metainfo

Author: l10n daemon script
Revision Date: 2016-02-02 10:52:32 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: Frederik Schwarzer
Revision Date: 2016-01-27 11:20:12 UTC

Use KCrash.

Author: Frederik Schwarzer
Revision Date: 2016-01-27 10:19:24 UTC

Remove unused.

Author: l10n daemon script
Revision Date: 2016-01-22 03:44:49 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2016-01-02 03:24:59 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2015-12-09 07:17:32 UTC

SVN_SILENT made messages (after extraction)

Author: Raphael Kubo da Costa
Revision Date: 2015-11-28 13:30:54 UTC

Merge branch 'Applications/15.12'

* Applications/15.12:
  Extend -std=c99 compiler flag to clang.

Author: Michael
Revision Date: 2015-11-14 17:32:18 UTC

Fix build with cmake-3.4

Author: Anthony Fieroni
Revision Date: 2015-11-07 17:30:46 UTC

[svn] Add the possibility to revert local changes via context menu.

REVIEW: 125653

Author: scripty
Revision Date: 2015-11-05 04:26:45 UTC

SVN_SILENT made messages (.desktop file) - always resolve mine-conflict

In case of conflict in i18n, keep the version of the branch "--accept mine-conflict"
To resolve a particular conflict, "svn resolve --accept mine-full path/to/file.desktop"

Author: l10n daemon script
Revision Date: 2015-11-05 04:22:45 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: l10n daemon script
Revision Date: 2015-11-05 04:17:01 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: David Faure
Revision Date: 2015-07-27 08:47:32 UTC

set cmake_min_req to match kdelibs4 and enable newer policies

Author: l10n daemon script
Revision Date: 2015-08-16 04:03:02 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: Lasse Liehu
Revision Date: 2015-08-09 08:56:28 UTC

Merge branch 'Plasma/5.4'

Author: David Faure
Revision Date: 2015-07-29 06:35:35 UTC

set cmake_min_req to match kdelibs policy and enable newer cmake policies

Author: David Faure
Revision Date: 2015-07-28 11:24:33 UTC

set cmake_min_req to match kdelibs policy and enable newer cmake policies

Author: David Faure
Revision Date: 2015-07-27 11:09:20 UTC

cmake 2.8.9 sets CMP0003 to NEW -> clean up

Author: David Faure
Revision Date: 2015-07-27 08:56:47 UTC

set cmake_min_req to match kdelibs4 and enable newer policies

Author: David Faure
Revision Date: 2015-07-27 08:51:40 UTC

set cmake_min_req to match kdelibs4 and enable newer policies

Author: David Faure
Revision Date: 2015-07-27 08:49:19 UTC

set cmake_min_req to match kdelibs4 and enable newer policies

Author: David Faure
Revision Date: 2015-07-27 08:48:02 UTC

set cmake_min_req to match kdelibs4 and enable newer policies

fix linking (due to CMP0003)

Author: David Faure
Revision Date: 2015-07-27 08:25:09 UTC

set cmake_min_req to match kdelibs4 and enable newer policies

Author: David Faure
Revision Date: 2015-07-26 15:00:58 UTC

set cmake_min_req to match kdelibs4 policies; fix build accordingly

Author: David Faure
Revision Date: 2015-07-26 14:33:42 UTC

add cmake min req (matching kdelibs4 policies); fix linking

Author: scripty
Revision Date: 2015-07-18 04:17:07 UTC

SVN_SILENT made messages (.desktop file) - always resolve mine-conflict

In case of conflict in i18n, keep the version of the branch "--accept mine-conflict"
To resolve a particular conflict, "svn resolve --accept mine-full path/to/file.desktop"

Author: scripty
Revision Date: 2015-05-17 04:34:37 UTC

SVN_SILENT made messages (.desktop file) - always resolve mine-conflict

In case of conflict in i18n, keep the version of the branch "--accept mine-conflict"
To resolve a particular conflict, "svn resolve --accept mine-full path/to/file.desktop"

Author: l10n daemon script
Revision Date: 2015-05-10 04:12:49 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: David Rosca
Revision Date: 2015-05-05 15:07:59 UTC

Only delete adapter when removed from m_adapters hash

BUG: 346329

Author: Heiko Becker
Revision Date: 2015-04-20 12:11:59 UTC

Use FindPkgConfig instead of obsolete UsePkgConfig macro

The new macro also has the ability to use the ${PKG_CONFIG} env
variable, which works with a arch-prefixed pkg-config for example.

REVIEW: 123196

Author: Aleix Pol
Revision Date: 2015-04-08 23:03:40 UTC

Clean up the missing crumbs in the repository

It was all split into where it belonged.

Author: Antonis Tsiapaliokas
Revision Date: 2015-04-03 17:57:43 UTC

Define the PROJECT_VERSION variable in order to populate
the version of the applications automatically.

REVIEW: 123246

Author: l10n daemon script
Revision Date: 2015-04-03 04:45:46 UTC

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

Author: Jan Grulich
Revision Date: 2015-03-30 14:41:44 UTC

Merge branch 'frameworks'

Author: Yuri Chornoivan
Revision Date: 2015-03-15 13:26:32 UTC

Fix EBN issues

Author: l10n daemon script
Revision Date: 2015-03-15 08:37:38 UTC

SVN_SILENT made messages (after extraction)

Author: Jerome Pasion
Revision Date: 2015-03-05 15:54:35 UTC

Doc: Adding Qt Quick Controls "Getting Started".

-A new Getting Started guide that uses the Qt Designer and Qt Creator
workflow.
-Uses Controls, Layouts, and Window QML types.
-Written with Qt Creator 3.3 and Qt 5.4.

Task-number: QTBUG-33595
Change-Id: I75fe5d6b439255d867de75b6b5c7c26bc82491e0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>

Author: Friedemann Kleint
Revision Date: 2015-03-05 08:00:47 UTC

Further fixes to translated messages.

Change-Id: I7d5f9f8b9ad26ed607684c44e231eb0fcbcdc9ab
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

Author: Orgad Shaneh
Revision Date: 2015-03-05 06:38:10 UTC

Update Hebrew translation for linguist and qtconfig

Change-Id: Ic19596ddc1da75a11c7a52dc07266e05b43643c8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Genghis Khan <genghiskhan@gmx.ca>

Author: Yoann Lopes
Revision Date: 2015-03-04 15:50:04 UTC

Improve QMediaPlayer auto tests.

Use test data only for test functions that require it.

Change-Id: I7fde1ba53ee8d2f5294597fd309a6e7d7dbbe15d
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Author: Sergio Ahumada
Revision Date: 2015-03-04 09:40:03 UTC

Rename Qt 5.4.1 -> 5.4.2 and Enginio 1.1.1 -> 1.1.2

Qt 5.4.1 and Qt Enginio 1.1.1 are already released

Change-Id: I7bd4c404c6b3e726c58389b869f6f57b8c00b6dc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>