From 8b107e99e5cc5b074049feb1c7f15ea0f83972b3 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sun, 6 Oct 2019 05:08:37 +0200 Subject: [PATCH 1/4] GIT_SILENT Upgrade KDE Applications version to 19.08.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e1213092..29983131e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(okular VERSION 1.8.${KDE_APPLICATIONS_VERSION_MICRO}) From 568f11b0678e68ef4eeb9bf63b618e32396658db Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Wed, 16 Oct 2019 14:48:13 +0200 Subject: [PATCH 2/4] don't crash on nullptr pdfOptionsPage Summary: same as in fbeff5ae7c2b27577d829839879b0966b5a3859a there may not be a pdfOptionsPage when using print preview. this fixes an exciting crash on our windows build when trying to print preview Test Plan: can't easily build on windows but the traceback definitely falls over 0x0000 on that line, so given context I am confident this fixes the crash Reviewers: aacid Reviewed By: aacid Subscribers: okular-devel Tags: #okular Differential Revision: https://phabricator.kde.org/D24696 --- generators/poppler/generator_pdf.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp index 0e4ca05c7..b6f943404 100644 --- a/generators/poppler/generator_pdf.cpp +++ b/generators/poppler/generator_pdf.cpp @@ -1362,8 +1362,11 @@ bool PDFGenerator::print( QPrinter& printer ) { #endif + if ( pdfOptionsPage ) + { // If requested, scale to full page instead of the printable area printer.setFullPage( pdfOptionsPage->ignorePrintMargins() ); + } QPainter painter; painter.begin(&printer); From 3e63353bfe77ffe390d00bcd15fcca52c5369d78 Mon Sep 17 00:00:00 2001 From: Oliver Sander Date: Wed, 30 Oct 2019 10:37:02 +0100 Subject: [PATCH 3/4] AnnotWindow: Always show creation time in local time BUG: 413591 (cherry picked from commit 92b7703292ab8cdef55be19524f916005b4c7dc8) --- ui/annotwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/annotwindow.cpp b/ui/annotwindow.cpp index e4d94b39e..b2260fffc 100644 --- a/ui/annotwindow.cpp +++ b/ui/annotwindow.cpp @@ -163,7 +163,7 @@ public: void setDate( const QDateTime& dt ) { - dateLabel->setText( QLocale().toString( dt, QLocale::ShortFormat ) + QLatin1Char(' ') ); + dateLabel->setText( QLocale().toString( dt.toTimeSpec(Qt::LocalTime), QLocale::ShortFormat ) + QLatin1Char(' ') ); } void setAuthor( const QString& author ) From 1cdc1819ed4dbb9ed543c3963878497d2d26035b Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Fri, 1 Nov 2019 22:52:56 +0100 Subject: [PATCH 4/4] GIT_SILENT Upgrade KDE Applications version to 19.08.3. (cherry picked from commit 2e722a0e366c8b12c4578a521f58372d06ecb2f2) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29983131e..955905af4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "2") +set (KDE_APPLICATIONS_VERSION_MICRO "3") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(okular VERSION 1.8.${KDE_APPLICATIONS_VERSION_MICRO})