Merge lp:~timo-jyrinki/kubuntu-packaging/qtbase_cherrypick_lp1299712 into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

[Timo Jyrinki]

* debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch
    - Cherry-pick a fix to a bug affecting online accounts (LP: #1299712)

[Timo Jyrinki (timo-jyrinki)]

Will be built at https://launchpad.net/~ci-train-ppa-service/+archive/landing-012

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-trusty-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-trusty-armhf-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtbase-opensource-src-ci/33/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-25 11:50:39 +0000
+++ debian/changelog	2014-04-01 12:51:30 +0000
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.2.1+dfsg-1ubuntu11) trusty; urgency=medium
+
+  * debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch
+    - Cherry-pick a fix to a bug affecting online accounts (LP: #1299712)
+
+ -- Timo Jyrinki <[e-mail]>  Tue, 01 Apr 2014 12:41:00 +0000
+
 qtbase-opensource-src (5.2.1+dfsg-1ubuntu10) trusty; urgency=medium
 
   * Make qt5-qmake Multi-Arch: same since it moved from shipping files in
 
=== added file 'debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch'
--- debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/When-looking-up-the-window-hierarchy-stop-at-foreign.patch	2014-04-01 12:51:30 +0000
@@ -0,0 +1,40 @@
+From fa5e611af1bc38ba1305fd1983f7560cbc4aa041 Mon Sep 17 00:00:00 2001
+From: Alberto Mardegan <[e-mail]>
+Date: Mon, 31 Mar 2014 15:25:44 +0300
+Subject: [PATCH] When looking up the window hierarchy, stop at foreign windows
+
+If the window being activated is an embedded window, the parent window
+will be a foreign window (usually not even belonging to the current
+process); we shouldn't attempt to focus it.
+
+Task-number: QTBUG-37984
+Change-Id: I2ea03a86b30bbc43cde643e18e0e1d020e5f2c84
+---
+ src/widgets/kernel/qapplication_qpa.cpp | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
+index 2f6e8ac..5a4a459 100644
+--- a/src/widgets/kernel/qapplication_qpa.cpp
++++ b/src/widgets/kernel/qapplication_qpa.cpp
+@@ -126,8 +126,15 @@ bool QApplicationPrivate::modalState()
+ 
+ QWidget *qt_tlw_for_window(QWindow *wnd)
+ {
+-    while (wnd && !wnd->isTopLevel()) // QTBUG-32177, wnd might be a QQuickView embedded via window container.
+-        wnd = wnd->parent();
++    // QTBUG-32177, wnd might be a QQuickView embedded via window container.
++    while (wnd && !wnd->isTopLevel()) {
++        QWindow *parent = wnd->parent();
++        // Don't end up in windows not belonging to this application
++        if (parent && parent->type() != Qt::ForeignWindow)
++            wnd = wnd->parent();
++        else
++            break;
++    }
+     if (wnd)
+         foreach (QWidget *tlw, qApp->topLevelWidgets())
+             if (tlw->windowHandle() == wnd)
+-- 
+1.9.0
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-18 06:00:39 +0000
+++ debian/patches/series	2014-04-01 12:51:30 +0000
@@ -28,3 +28,4 @@
 Fix-log_clusters-calculation-in-HarfBuzz-NG-code-pat.patch
 Minor-optimization-for-QTextEngine-shapeText.patch
 HarfBuzz-NG-Hide-characters-that-should-normally-be-.patch
+When-looking-up-the-window-hierarchy-stop-at-foreign.patch