[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-2-17-g7750945
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Thu Oct 22 13:44:20 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=7750945
The following commit has been merged in the master branch:
commit 7750945aaf4bb154396162ce4a548a7582b6a679
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu Oct 22 16:44:13 2015 +0300
Backport upstream patch to set positionAutomatic when using setX/setY.
Partially fixes the VLC display issues.
---
debian/changelog | 3 +++
debian/patches/series | 1 +
debian/patches/set_positionautomatic.diff | 30 ++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index d364fdc..64b3577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
qtbase-opensource-src (5.5.1+dfsg-3) UNRELEASED; urgency=medium
+ [ Dmitry Shachnev ]
+ * Backport upstream patch to set positionAutomatic when using setX/setY
+ (set_positionautomatic.diff; partially fixes the VLC display issues).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 22 Oct 2015 16:40:42 +0300
diff --git a/debian/patches/series b/debian/patches/series
index aa5f22c..a971ca7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
# Backported stuff
Fix-compile-error-on-big-endian.patch
+set_positionautomatic.diff
# Debian specific.
gnukfreebsd.diff
diff --git a/debian/patches/set_positionautomatic.diff b/debian/patches/set_positionautomatic.diff
new file mode 100644
index 0000000..76c1895
--- /dev/null
+++ b/debian/patches/set_positionautomatic.diff
@@ -0,0 +1,30 @@
+Description: set positionAutomatic when using setX setY
+Origin: upstream, http://code.qt.io/cgit/qt/qtbase.git/commit/?id=71df75966db5f51c
+Last-Update: 2015-10-22
+
+--- a/src/gui/kernel/qwindow.cpp
++++ b/src/gui/kernel/qwindow.cpp
+@@ -1270,8 +1270,11 @@
+ */
+ void QWindow::setX(int arg)
+ {
++ Q_D(QWindow);
+ if (x() != arg)
+ setGeometry(QRect(arg, y(), width(), height()));
++ else
++ d->positionAutomatic = false;
+ }
+
+ /*!
+@@ -1280,8 +1283,11 @@
+ */
+ void QWindow::setY(int arg)
+ {
++ Q_D(QWindow);
+ if (y() != arg)
+ setGeometry(QRect(x(), arg, width(), height()));
++ else
++ d->positionAutomatic = false;
+ }
+
+ /*!
--
qtbase packaging
More information about the pkg-kde-commits
mailing list