GitLab

CCBUG: 415749

Commit 823abcd2 introduced a call to KIO::statDetails(), which only exists
since KIO 5.69.0.
But the specified minimum KDE Frameworks version is 5.55.0, so switch back
to using KIO::stat() when building with KIO < 5.69.0.

Also, pass KIO::StatNoDetails to KIO::statDetails() to not request unnecessary
details, as the intention is to just check whether the file exists.

This line has been forgotten to be changed in commit 823abcd2, resulting
in a compiler error when e.g. building with Qt 5.12 LTS.

Phabricator is no more used.

There are 2 "version.h" generated headers: one static in the sources
filled by cmake, and the other generated by ecm_setup_version().

Consolidate and port to ecm_setup_version():
- move SKANLITE_VERSION_STRING up in the CMakeLists.txt
- use SKANLITE_VERSION_STRING in ecm_setup_version() instead of the KF5
  requirement
- generate src/skanlite_version.h
- drop the PACKAGE_VERSION_FILE stuff, as it is a cmake config file for
  exported libraries (there are none)
- port skanlite to skanlite_version.h and the SKANLITE_VERSION_* macros
  it provides
- remove the version.h.cmake template, no more needed now

It is added few lines later, so it is usable.

Do not remove anything deprecated even in future Qt version, as it it
too harsh.

Log all the debug messages with a org.kde.skanlite category.

This is Skanlite not the KSane library...

If the image saving takes longer than the scanning (unlikely) and the
previous save operation is still active, the new save operation would
fail. Creating new objects means that the saves can be done in parallel

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"

Or if we have manual-save-mode, set the save-path to the home folder
and open the save dialog as normal.

Do not inherit .ui classes as all users include the huge .ui header
SaveLocation usage is now more readable
Use QUrl everywhere in stead of converting to from QString
Use KUrlRequester in stead of reinventing the wheel

Summary: BUG: 397493

Reviewers: sars, #kde_applications, ngraham

Reviewed By: sars, #kde_applications, ngraham

Subscribers: cfeck, ngraham, pino

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

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"

Test Plan: Builds fine with Qt 5.15.0

Reviewers: sars, mlaurent

Reviewed By: sars, mlaurent

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

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"