From 1ef7e09fe4213b7003ef7f6da595b1cfd782cb09 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 30 Apr 2010 17:46:47 +0000
Subject: [PATCH] upstreamed qt47 patch too

---
 kdelibs-4.4.1-k3passworddialog_qt47.patch | 11 -----------
 kdelibs.spec                              |  2 --
 2 files changed, 13 deletions(-)
 delete mode 100644 kdelibs-4.4.1-k3passworddialog_qt47.patch

diff --git a/kdelibs-4.4.1-k3passworddialog_qt47.patch b/kdelibs-4.4.1-k3passworddialog_qt47.patch
deleted file mode 100644
index b7841c9..0000000
--- a/kdelibs-4.4.1-k3passworddialog_qt47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp.qt47	2008-05-21 06:06:15.000000000 -0500
-+++ kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp	2010-03-20 08:13:23.892254206 -0500
-@@ -83,7 +83,7 @@ class K3PasswordDialog::K3PasswordDialog
- {
-     public:
- 	K3PasswordDialogPrivate()
--	 : m_MatchLabel( 0 ), iconName( 0 ), allowEmptyPasswords( false ),
-+        : m_MatchLabel( 0 ), allowEmptyPasswords( false ),
- 	   minimumPasswordLength(0), maximumPasswordLength(K3PasswordEdit::PassLen - 1),
- 	   passwordStrengthWarningLevel(1), m_strengthBar(0),
- 	   reasonablePasswordLength(8)
diff --git a/kdelibs.spec b/kdelibs.spec
index 59b9bd5..dcf2453 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -89,7 +89,6 @@ Patch27: kdelibs-4.3.98-no_rpath.patch
 ## 4.4 upstream
 
 ## trunk upstream
-Patch110: kdelibs-4.4.1-k3passworddialog_qt47.patch 
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -239,7 +238,6 @@ format for easy browsing.
 # upstreamable patches
 
 # upstream patches
-%{?_qt47:%patch110 -p1 -b .k3passworddialog_qt47}
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702