diff options
| author | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
| commit | 7b37d1bc4f6b27188b0688dcdc2b89db3101575c (patch) | |
| tree | dccc02bc71441fbb202d0bfd622af264fc33c89f /debian/patches/40_alpha_ice.diff | |
| parent | 6ad728b38295ae6479662a58b8c640f389bfa607 (diff) | |
| download | qt4-x11-7b37d1bc4f6b27188b0688dcdc2b89db3101575c.tar.gz | |
Merge Qt4 4.5 branch to trunk.debian/4.5.0-rc1-1
Diffstat (limited to 'debian/patches/40_alpha_ice.diff')
| -rw-r--r-- | debian/patches/40_alpha_ice.diff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff index 621bc8a..45a0a9d 100644 --- a/debian/patches/40_alpha_ice.diff +++ b/debian/patches/40_alpha_ice.diff @@ -1,6 +1,6 @@ --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -72,14 +72,7 @@ class QLibraryInfoPrivate +@@ -71,14 +71,7 @@ class QLibraryInfoPrivate { public: static QSettings *findConfiguration(); @@ -16,7 +16,7 @@ static QSettings *configuration() { #ifdef QT_NO_THREAD -@@ -98,6 +91,15 @@ public: +@@ -97,6 +90,15 @@ public: } }; @@ -34,7 +34,7 @@ settings = QLibraryInfoPrivate::findConfiguration(); --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h -@@ -493,7 +493,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de +@@ -492,7 +492,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de } template <class Key, class T> |