[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.7.1+dfsg-2ubuntu1

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=51c436c

The following commit has been merged in the ubuntu branch:
commit 51c436c498bf68768b674034ab23ea5f0bbbf551
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 2 09:39:00 2017 +0000

    debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch:
    
    * debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch:
      - Backport from 5.8 (LP: #1642605)
---
 debian/changelog                                   |  2 ++
 ...ttings-Avoid-unneeded-sync-on-destruction.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 541d188..61ceb2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ qtbase-opensource-src (5.7.1+dfsg-2ubuntu1) UNRELEASED; urgency=medium
   * Adjust tests enablement patch for Qt 5.7 and 5.7.1.
   * Drop also net-bearer-nm-disconnect-ap-signals7.patch that was upstreamed.
   * Ubuntu doesn't have package named libssl1.0-dev yet.
+  * debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch:
+    - Backport from 5.8 (LP: #1642605)
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 25 Aug 2016 11:01:48 +0000
 
diff --git a/debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch b/debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch
new file mode 100644
index 0000000..f753db6
--- /dev/null
+++ b/debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch
@@ -0,0 +1,29 @@
+From 1155ca10f8e329d253f7dd58dad396321116798c Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <albert.astals at canonical.com>
+Date: Wed, 23 Nov 2016 11:13:48 +0100
+Subject: [PATCH] QSettings: Avoid unneeded sync() on destruction
+
+... if sync() has already been called manually.
+
+Change-Id: I11bd6810aa3c1065a72ffaa2001d1bdbf8bf9c89
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at qt.io>
+Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+---
+ src/corelib/io/qsettings.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
+index 480a777..8c67d97 100644
+--- a/src/corelib/io/qsettings.cpp
++++ b/src/corelib/io/qsettings.cpp
+@@ -2705,6 +2705,7 @@ void QSettings::sync()
+ {
+     Q_D(QSettings);
+     d->sync();
++    d->pendingChanges = false;
+ }
+ 
+ /*!
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 11a3abe..1a22446 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ qsettings_simplify_logic.diff
 qsettings_XDG_CONFIG_DIRS.diff
 fix_build_on_x32.diff
 gcc_6.3.diff
+QSettings-Avoid-unneeded-sync-on-destruction.patch
 
 # Debian specific.
 no_dbus_dependency.diff

-- 
qtbase packaging