[mingw-qwt: 11/21] qt 4.6.1 compile workaround

[Kalev Lember]

commit 0096499927cd80931bb4eb87eb29973c9c123383
Author: sailer <sailer at fedoraproject.org>
Date:   Sat Feb 13 19:49:44 2010 +0000

    qt 4.6.1 compile workaround

 mingw32-qwt.spec |    5 ++++-
 qwt-qhash.patch  |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mingw32-qwt.spec b/mingw32-qwt.spec
index 833a8d8..0827f29 100644
--- a/mingw32-qwt.spec
+++ b/mingw32-qwt.spec
@@ -4,7 +4,7 @@
 Name:           mingw32-%{name1}
 Summary:        MinGW Windows Qwt library
 Version:        5.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://qwt.sourceforge.net
 License:        LGPLv2 with exceptions
 Group:          Development/Libraries
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/lib%{name1}d5.a
 
 %changelog
+* Sat Feb 13 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.0-3
+- qt 4.6.1 compile workaround
+
 * Wed Dec  2 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.2.0-2
 - qt 4.6.0 compile workarounds
 
diff --git a/qwt-qhash.patch b/qwt-qhash.patch
index a70fefb..5c98cdd 100644
--- a/qwt-qhash.patch
+++ b/qwt-qhash.patch
@@ -160,7 +160,7 @@
  #if defined(QWT_TEMPLATEDLL)
  
 -#if QT_VERSION < 0x040300
-+#if QT_VERSION < 0x040601
++#if QT_VERSION < 0x040800
  // Some compilers have problems, 
  // without a qHash(double) implementation
 +inline uint qHash(double key) { return uint(key); }