[SCM] qtbase packaging branch, ubuntu-lts, updated. ubuntu/5.6.1+dfsg-3ubuntu7-6-gc8a0e91

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu-lts branch:
commit a5d07b184100296af78907611a63181e763f2aac
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jan 10 12:57:12 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 35b5ce5..c2e19de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ qtbase-opensource-src (5.6.2+dfsg-0ubuntu1) UNRELEASED; urgency=medium
     - Fix-the-GCC-version-supporting-Wsuggest-override.patch
     - QtWidgets-Send-show-hide-event-to-children-on-restor.patch
   * Skip a few widgets related tests having failures.
+  * debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch:
+    - Backport from 5.8 (LP: #1642605)
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 13 Oct 2016 13:22:14 +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 be00756..6ea46e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,7 @@ Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
 Fix-some-QtDBus-crashes-during-application-destructi.patch
 Make-the-bearer-QFactoryLoader-a-member-variable-not.patch
 Stop-unloading-plugins-in-QPluginLoader-and-QFactory.patch
+QSettings-Avoid-unneeded-sync-on-destruction.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging