From e6fcba4535559b7a256918630d5daf5318084654 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 24 Oct 2017 21:33:54 +0200 Subject: [PATCH] Cherry-picking upstream release 0.12.0. * Bumped Standards to 4.1.1 - no changes needed * Bumped liblxqt dependency to >= 0.12.0 --- .gitignore | 2 -- AUTHORS | 2 +- CHANGELOG | 12 +++++++++++- CMakeLists.txt | 5 ++++- debian/changelog | 8 ++++++++ debian/control | 8 ++++---- main.cpp | 2 ++ 7 files changed, 30 insertions(+), 9 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4e983f8..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -translations/lxqt-sudo diff --git a/AUTHORS b/AUTHORS index f6f28be..f82970b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,7 +2,7 @@ Upstream Authors: LXQt team: http://lxqt.org Copyright: - Copyright (c) 2015-2016 LXQt team + Copyright (c) 2015-2017 LXQt team License: LGPL-2.1+ The full text of the licenses can be found in the 'LICENSE' file. diff --git a/CHANGELOG b/CHANGELOG index 82f0d24..abd23f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,17 @@ -lxqt-sudo-0.11.1 / 2017-01-01 +lxqt-sudo-0.12.0 / 2017-10-21 ============================= + * Set informal patch version + * Added basic .gitattributes + * Drops Qt5Core_VERSION_STRING + * set Qt::AA_UseHighDpiPixmaps to true + * Bump year + +0.11.1 / 2017-01-01 +=================== + + * Release 0.11.1: Update changelog * Make CMakeLists.txt more uniform. 0.11.0 / 2016-09-24 diff --git a/CMakeLists.txt b/CMakeLists.txt index 87d434a..e52da3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,10 +12,13 @@ option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" O option(PULL_TRANSLATIONS "Pull translations" ON) find_package(Qt5Widgets REQUIRED) -message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}") +message(STATUS "Building with Qt${Qt5Core_VERSION}") find_package(lxqt REQUIRED) +# Patch version 0 + + include(LXQtCompilerSettings NO_POLICY_SCOPE) set ( LINK_LXSU "lxsu") diff --git a/debian/changelog b/debian/changelog index fe193e0..18f837c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lxqt-sudo (0.12.0-1) experimental; urgency=medium + + * Cherry-picking upstream release 0.12.0. + * Bumped Standards to 4.1.1 - no changes needed + * Bumped liblxqt dependency to >= 0.12.0 + + -- Alf Gaida Tue, 24 Oct 2017 21:33:45 +0200 + lxqt-sudo (0.11.1-2) unstable; urgency=medium * Bumped Standards to 4.0.0 - no changes needed diff --git a/debian/control b/debian/control index 3c07142..cc5b746 100644 --- a/debian/control +++ b/debian/control @@ -7,13 +7,13 @@ Section: x11 Priority: optional Build-Depends: debhelper (>= 10), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.11.1), + liblxqt0-dev (>= 0.12.0), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev -Standards-Version: 4.0.0 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-sudo.git/?h=debian/sid -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-sudo.git -b debian/sid +Standards-Version: 4.1.1 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-sudo.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-sudo.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-sudo Package: lxqt-sudo diff --git a/main.cpp b/main.cpp index d034580..48ebb8a 100644 --- a/main.cpp +++ b/main.cpp @@ -32,6 +32,8 @@ int main(int argc, char **argv) { LXQt::Application app(argc, argv, true); app.setQuitOnLastWindowClosed(false); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + Sudo s; return s.main(); }