From 32aeb96a5ac9c09c5969d92574118ce8fbe16d2d Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Thu, 26 Aug 2010 19:06:19 +0200
Subject: [PATCH] 4.7rc1

---
 ...0695277a3864b42d082095962f8742cdcf04.patch | 30 -------------------
 qt.spec                                       |  3 --
 2 files changed, 33 deletions(-)
 delete mode 100644 9a1b0695277a3864b42d082095962f8742cdcf04.patch

diff --git a/9a1b0695277a3864b42d082095962f8742cdcf04.patch b/9a1b0695277a3864b42d082095962f8742cdcf04.patch
deleted file mode 100644
index 1ca4d49..0000000
--- a/9a1b0695277a3864b42d082095962f8742cdcf04.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9a1b0695277a3864b42d082095962f8742cdcf04 Mon Sep 17 00:00:00 2001
-From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
-Date: Thu, 1 Jul 2010 12:00:05 +0200
-Subject: [PATCH] Fixed QX11EmbedContainer.
-
-Enforce the creation of the native window id for the focusproxy widget inside
-the container to make sure we won't get a CreateNotify event to try to embed
-the focusproxy itself.
-
-Task-number: QTBUG-10809
-Reviewed-by: Bradley T. Hughes
----
- src/gui/kernel/qx11embed_x11.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp
-index b527e72..9f1b1f8 100644
---- a/src/gui/kernel/qx11embed_x11.cpp
-+++ b/src/gui/kernel/qx11embed_x11.cpp
-@@ -1070,6 +1070,7 @@ QX11EmbedContainer::QX11EmbedContainer(QWidget *parent)
-     d->focusProxy = new QWidget(this);
-     d->focusProxy->setAttribute(Qt::WA_NativeWindow);
-     d->focusProxy->setAttribute(Qt::WA_DontCreateNativeAncestors);
-+    d->focusProxy->createWinId();
-     d->focusProxy->setGeometry(-1, -1, 1, 1);
- 
-     // We need events from the window (activation status) and
--- 
-1.6.1
-
diff --git a/qt.spec b/qt.spec
index 6db3bdc..ad6cb98 100644
--- a/qt.spec
+++ b/qt.spec
@@ -66,8 +66,6 @@ Patch58: qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
 # security patches
 
 # upstream patches
-# http://bugreports.qt.nokia.com/browse/QTBUG-10809
-Patch101: http://qt.gitorious.org/+qt-developers/qt/staging/commit/9a1b0695277a3864b42d082095962f8742cdcf04.patch
 
 # kde-qt git patches
 Patch201: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
@@ -425,7 +423,6 @@ Qt libraries used for drawing widgets and OpenGL items.
 # security fixes
 
 # upstream patches
-%patch101 -p1 -b .QTBUG-10809
 
 # kde-qt branch
 %if 0%{?kde_qt}