[arch-commits] Commit in qt/trunk (4 files)
Date: Thursday, November 29, 2012 @ 12:17:54
Author: andrea
Revision: 172119
upgpkg: qt 4.8.4-1
Upstream release
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/disable-ssl-compression.patch
qt/trunk/fix-qtscript-crash.patch
qt/trunk/qsortfilterproxymodel.patch
---+
PKGBUILD | 25 ++
disable-ssl-compression.patch | 68
fix-qtscript-crash.patch | 34
qsortfilterproxymodel.patch | 63 -
4 files changed, 5 insertions(+), 185 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-11-29 17:09:42 UTC (rev 172118)
+++ PKGBUILD2012-11-29 17:17:54 UTC (rev 172119)
@@ -4,8 +4,8 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.3
-pkgrel=6
+pkgver=4.8.4
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -19,20 +19,14 @@
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
'improve-cups-support.patch'
-'fix-crash-in-assistant.patch'
-'disable-ssl-compression.patch'
-'fix-qtscript-crash.patch'
-'qsortfilterproxymodel.patch')
-md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
+'fix-crash-in-assistant.patch')
+md5sums=('89c5ecba180cae74c66260ac732dc5cb'
'f1837a03fd0ebbd2da58975845f278e3'
'480fea1ed076992b688373c8db274be0'
'5595c24d5bb942c21e3a4d299e6d0bf1'
'824a3b77a25e98567f640e0441ccdebc'
'c439c7731c25387352d8453ca7574971'
- '57590084078b6379f0501f7728b02ae2'
- '94e9e433342018bf35e8d6d968b7432c'
- '71579422635e9343665de1c1ba5a3f91'
- 'cd550cd628d10459128ca5f231ca6d3f')
+ '57590084078b6379f0501f7728b02ae2')
build() {
cd ${_pkgfqn}
@@ -43,15 +37,6 @@
# (FS#29469)
patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
- # Security fix
- patch -p1 -i "${srcdir}"/disable-ssl-compression.patch
-
- # QTBUG#27322
- patch -p1 -i "${srcdir}"/fix-qtscript-crash.patch
-
- # QTBUG#27122
- patch -p1 -i "${srcdir}"/qsortfilterproxymodel.patch
-
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Deleted: disable-ssl-compression.patch
===
--- disable-ssl-compression.patch 2012-11-29 17:09:42 UTC (rev 172118)
+++ disable-ssl-compression.patch 2012-11-29 17:17:54 UTC (rev 172119)
@@ -1,68 +0,0 @@
-From d41dc3e101a694dec98d7bbb582d428d209e5401 Mon Sep 17 00:00:00 2001
-From: Richard Moore
-Date: Fri, 14 Sep 2012 00:13:08 +0100
-Subject: [PATCH] Disable SSL compression by default.
-
-Disable SSL compression by default since this appears to be the a likely
-cause of the currently hyped CRIME attack.
-
-This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74
-
-Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a
-Reviewed-by: Thiago Macieira
-Reviewed-by: Peter Hartmann
- src/network/ssl/qssl.cpp |5 +++--
- src/network/ssl/qsslconfiguration.cpp |4 +++-
- src/network/ssl/qsslconfiguration_p.h |4 +++-
- 3 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
-index 49e086f..9578178 100644
a/src/network/ssl/qssl.cpp
-+++ b/src/network/ssl/qssl.cpp
-@@ -148,8 +148,9 @@ QT_BEGIN_NAMESPACE
-
- By default, SslOptionDisableEmptyFragments is turned on since this causes
- problems with a large number of servers.
SslOptionDisableLegacyRenegotiation
--is also turned on, since it introduces a security risk. The other options
--are turned off.
-+is also turned on, since it introduces a security risk.
-+SslOptionDisableCompression is turned on to prevent the attack publicised
by
-+CRIME. The other options are turned off.
-
- Note: Availability of above options depends on the version of the SSL
- backend in use.
-diff --git a/src/network/ssl/qsslconfiguration.cpp
b/src/network/ssl/qsslconfiguration.cpp
-index 24c7b77..3a05f54 100644
a/src/network/ssl/qsslconfiguration.cpp
-+++ b/src/network/ssl/qsslconfiguration.cpp
-@@ -201,7 +201,9 @@ bool QSslConfiguration::isNull() const
- d->privateKey.isNull() &&
- d->peerCertificate.isNull() &&
- d->peerCertificateChain.count() == 0 &&
--d->sslOptions ==
(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation));
-+d->sslOptions == ( QSsl::SslOptionDisableEmptyFragments
-+ |QSsl::SslOptionDisableLegacyRenegotiation
-+ |QSsl::SslOptionDisableCompression));
- }
-
- /*!
-diff --git a/src/network/ssl/qsslconfiguration_p.h
b/src/network/ssl/qsslconfiguration_p.h
-index 74f17cd..c36b651 100644
a
[arch-commits] Commit in qt/trunk (4 files)
Date: Tuesday, November 20, 2012 @ 08:10:56 Author: andrea Revision: 171609 Remove deprecated entries (FS#32686) Modified: qt/trunk/assistant.desktop qt/trunk/designer.desktop qt/trunk/linguist.desktop qt/trunk/qtconfig.desktop ---+ assistant.desktop |1 - designer.desktop |1 - linguist.desktop |1 - qtconfig.desktop |1 - 4 files changed, 4 deletions(-) Modified: assistant.desktop === --- assistant.desktop 2012-11-20 13:10:55 UTC (rev 171608) +++ assistant.desktop 2012-11-20 13:10:56 UTC (rev 171609) @@ -4,6 +4,5 @@ Exec=/usr/bin/assistant Icon=assistant Terminal=false -Encoding=UTF-8 Type=Application Categories=Qt;Development;Documentation; Modified: designer.desktop === --- designer.desktop2012-11-20 13:10:55 UTC (rev 171608) +++ designer.desktop2012-11-20 13:10:56 UTC (rev 171609) @@ -6,6 +6,5 @@ Icon=designer MimeType=application/x-designer; Terminal=false -Encoding=UTF-8 Type=Application Categories=Qt;Development; Modified: linguist.desktop === --- linguist.desktop2012-11-20 13:10:55 UTC (rev 171608) +++ linguist.desktop2012-11-20 13:10:56 UTC (rev 171609) @@ -5,6 +5,5 @@ Icon=linguist MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false -Encoding=UTF-8 Type=Application Categories=Qt;Development; Modified: qtconfig.desktop === --- qtconfig.desktop2012-11-20 13:10:55 UTC (rev 171608) +++ qtconfig.desktop2012-11-20 13:10:56 UTC (rev 171609) @@ -4,7 +4,6 @@ Exec=/usr/bin/qtconfig Icon=qtlogo Terminal=false -Encoding=UTF-8 Type=Application Categories=Qt;Settings; NoDisplay=true
[arch-commits] Commit in qt/trunk (4 files)
Date: Wednesday, May 23, 2012 @ 08:58:55
Author: andrea
Revision: 159390
upgpkg: qt 4.8.2-1
Upstream release
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/fix-buffer-overflow.patch
qt/trunk/fix-cursortox-crash.patch
qt/trunk/gcc47.patch
---+
PKGBUILD | 26 ++
fix-buffer-overflow.patch | 34 --
fix-cursortox-crash.patch | 32
gcc47.patch | 27 ---
4 files changed, 6 insertions(+), 113 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-05-23 11:25:46 UTC (rev 159389)
+++ PKGBUILD2012-05-23 12:58:55 UTC (rev 159390)
@@ -4,8 +4,8 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.1
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -15,34 +15,20 @@
'mysql' 'unixodbc' 'cups' 'gtk2')
options=('!libtool')
_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
-source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
+source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'gcc47.patch'
-'improve-cups-support.patch'
-'fix-buffer-overflow.patch'
-'fix-cursortox-crash.patch')
-md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
+'improve-cups-support.patch')
+md5sums=('3c1146ddf56247e16782f96910a8423b'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'd8a0e81075b290ddc18ecd33b9b7ee22'
- 'c439c7731c25387352d8453ca7574971'
- 'c493dca3c11fffb9af6719c6735cb0d2'
- '13171b6aec2f240be05feb968178f70e')
+ 'c439c7731c25387352d8453ca7574971')
build() {
cd "${srcdir}"/${_pkgfqn}
- patch -p1 -i "${srcdir}"/gcc47.patch
-
- # (FS#29158)
- patch -p1 -i "${srcdir}"/fix-buffer-overflow.patch
-
- # (FS#29402) (QTBUG#24718)
- patch -p1 -i "${srcdir}"/fix-cursortox-crash.patch
-
# (FS#28381) (KDEBUG#180051)
patch -p1 -i "${srcdir}"/improve-cups-support.patch
Deleted: fix-buffer-overflow.patch
===
--- fix-buffer-overflow.patch 2012-05-23 11:25:46 UTC (rev 159389)
+++ fix-buffer-overflow.patch 2012-05-23 12:58:55 UTC (rev 159390)
@@ -1,34 +0,0 @@
-From 827e5c4c689d4ecb4f8c1ab48c9a7ab712fe2ca7 Mon Sep 17 00:00:00 2001
-From: John Tapsell
-Date: Mon, 12 Mar 2012 22:07:47 +
-Subject: [PATCH] Harfbuzz-thai - fix buffer overflow when setting item
- attributes
-
-Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713
-Reviewed-by: Eskil Abrahamsen Blomfeldt
- src/3rdparty/harfbuzz/src/harfbuzz-thai.c |9 +-
- .../qtextscriptengine/tst_qtextscriptengine.cpp| 29
- 2 files changed, 36 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
-index bf6c35b..3c0ffe8 100644
a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
-+++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
-@@ -263,8 +263,13 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices
(HB_ShaperItem *item)
- // The only glyphs that should be passed to this function
that cannot be mapped to
- // tis620 are the ones of type Inherited class. Pass these
glyphs untouched.
- glyphString[slen++] = string[i];
--if (string[i] == 0x200D || string[i] == 0x200C)
--item->attributes[slen-1].dontPrint = true; // Hide ZWJ
and ZWNJ characters
-+if (string[i] == 0x200D || string[i] == 0x200C) {
-+// Check that we do not run out of bounds when setting
item->attributes. If we do
-+// run out of bounds then this function will return
false, the necessary amount of
-+// memory is reallocated, and this function will then be
called again.
-+if (slen <= item->num_glyphs)
-+item->attributes[slen-1].dontPrint = true; // Hide
ZWJ and ZWNJ characters
-+}
- } else {
- glyphString[slen++] = (HB_UChar16) thai_get_glyph_index
(font_type, rglyphs[lgi]);
- }
-
Deleted: fix-cursortox-crash.patch
===
--- fix-cursortox-crash.patch 2012-05-23 11:25:46 UTC (rev 159389)
+++ fix-cursortox-crash.patch 2012-05-23 12:58:55 UTC (rev 159390)
@@ -1,32 +0,0 @@
-Index: fix-cursortox-crash.patch
-===
fix-cursortox-crash.patch (revision 0)
-+++ fix-cursortox-
[arch-commits] Commit in qt/trunk (4 files)
Date: Saturday, April 14, 2012 @ 06:05:08
Author: andrea
Revision: 156132
upgpkg: qt 4.8.1-2
Re-apply improved cups support patch (FS#28381); Fix buffer overflow
(FS#29158); Fix a crash in CursorTox (FS#29402)
Added:
qt/trunk/fix-buffer-overflow.patch
qt/trunk/fix-cursortox-crash.patch
qt/trunk/improve-cups-support.patch
Modified:
qt/trunk/PKGBUILD
+
PKGBUILD | 21 +-
fix-buffer-overflow.patch | 34 +
fix-cursortox-crash.patch | 32
improve-cups-support.patch | 84 +++
4 files changed, 168 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-14 10:03:39 UTC (rev 156131)
+++ PKGBUILD2012-04-14 10:05:08 UTC (rev 156132)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -18,19 +18,34 @@
source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'gcc47.patch')
+'gcc47.patch'
+'improve-cups-support.patch'
+'fix-buffer-overflow.patch'
+'fix-cursortox-crash.patch')
md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'd8a0e81075b290ddc18ecd33b9b7ee22')
+ 'd8a0e81075b290ddc18ecd33b9b7ee22'
+ 'c439c7731c25387352d8453ca7574971'
+ 'c493dca3c11fffb9af6719c6735cb0d2'
+ '13171b6aec2f240be05feb968178f70e')
build() {
cd "${srcdir}"/${_pkgfqn}
patch -p1 -i "${srcdir}"/gcc47.patch
+
+ # (FS#29158)
+ patch -p1 -i "${srcdir}"/fix-buffer-overflow.patch
+
+ # (FS#29402) (QTBUG#24718)
+ patch -p1 -i "${srcdir}"/fix-cursortox-crash.patch
+ # (FS#28381) (KDEBUG#180051)
+ patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: fix-buffer-overflow.patch
===
--- fix-buffer-overflow.patch (rev 0)
+++ fix-buffer-overflow.patch 2012-04-14 10:05:08 UTC (rev 156132)
@@ -0,0 +1,34 @@
+From 827e5c4c689d4ecb4f8c1ab48c9a7ab712fe2ca7 Mon Sep 17 00:00:00 2001
+From: John Tapsell
+Date: Mon, 12 Mar 2012 22:07:47 +
+Subject: [PATCH] Harfbuzz-thai - fix buffer overflow when setting item
+ attributes
+
+Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713
+Reviewed-by: Eskil Abrahamsen Blomfeldt
+---
+ src/3rdparty/harfbuzz/src/harfbuzz-thai.c |9 +-
+ .../qtextscriptengine/tst_qtextscriptengine.cpp| 29
+ 2 files changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
+index bf6c35b..3c0ffe8 100644
+--- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
+@@ -263,8 +263,13 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices
(HB_ShaperItem *item)
+ // The only glyphs that should be passed to this function
that cannot be mapped to
+ // tis620 are the ones of type Inherited class. Pass these
glyphs untouched.
+ glyphString[slen++] = string[i];
+-if (string[i] == 0x200D || string[i] == 0x200C)
+-item->attributes[slen-1].dontPrint = true; // Hide ZWJ
and ZWNJ characters
++if (string[i] == 0x200D || string[i] == 0x200C) {
++// Check that we do not run out of bounds when setting
item->attributes. If we do
++// run out of bounds then this function will return
false, the necessary amount of
++// memory is reallocated, and this function will then be
called again.
++if (slen <= item->num_glyphs)
++item->attributes[slen-1].dontPrint = true; // Hide
ZWJ and ZWNJ characters
++}
+ } else {
+ glyphString[slen++] = (HB_UChar16) thai_get_glyph_index
(font_type, rglyphs[lgi]);
+ }
+
Added: fix-cursortox-crash.patch
===
--- fix-cursortox-crash.patch (rev 0)
+++ fix-cursortox-crash.patch 2012-04-14 10:05:08 UTC (rev 156132)
@@ -0,0 +1,32 @@
+Index: fix-cursortox-crash.patch
+===
+--- fix-cursortox-crash.patch (revision 0)
fix-cursortox-crash.patch (arbetskopia)
+#commit cac12f4592477d99ef6fffaad40345bf85ef53b5
+#Author: Jiang
[arch-commits] Commit in qt/trunk (4 files)
Date: Wednesday, February 29, 2012 @ 06:11:41
Author: andrea
Revision: 151648
Improve filter event (KDEBUG#275469); Fix regression in QGraphicsScene
(FS#28707)
Added:
qt/trunk/fix-qgraphicsscene-regression.patch
qt/trunk/improved-filter-event.patch
qt/trunk/qurl-backward-compatibility.patch
Modified:
qt/trunk/PKGBUILD
-+
PKGBUILD| 15 -
fix-qgraphicsscene-regression.patch | 55 +++
improved-filter-event.patch | 98 ++
qurl-backward-compatibility.patch | 13
4 files changed, 179 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-29 10:28:02 UTC (rev 151647)
+++ PKGBUILD2012-02-29 11:11:41 UTC (rev 151648)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -18,12 +18,18 @@
source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz";
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
-'fix-qurl.patch')
+'fix-qurl.patch'
+'fix-qgraphicsscene-regression.patch'
+'improved-filter-event.patch'
+'qurl-backward-compatibility.patch')
md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
'6b771c8a81dd90b45e8a79afa0e5bbfd'
+ '7bc255a36733d0fbc80c1902ade4beca'
+ 'c2e91fc028250a590e76effe234468e2'
+ '444ebeb716d7c7379835efb8aa88e6c8'
'7bc255a36733d0fbc80c1902ade4beca')
build() {
@@ -31,6 +37,11 @@
# (FS#27757)
patch -p1 -i "${srcdir}"/fix-qurl.patch
+ # (FS#28707)
+ patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch
+ # (KDEBUG#275469)
+ patch -p1 -i "${srcdir}"/improved-filter-event.patch
+ patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: fix-qgraphicsscene-regression.patch
===
--- fix-qgraphicsscene-regression.patch (rev 0)
+++ fix-qgraphicsscene-regression.patch 2012-02-29 11:11:41 UTC (rev 151648)
@@ -0,0 +1,55 @@
+From 15c14584199dc43e4a309fc331f3144009008128 Mon Sep 17 00:00:00 2001
+From: Jonathan Liu
+Date: Fri, 24 Feb 2012 00:42:34 +1100
+Subject: [PATCH] Revert "Don't rely on mapFromGlobal in
+ QGraphicsScenePrivate::itemsAtPosition."
+
+This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e.
+The commit caused a regression whereby tooltips may be shown even if the
+mouse is not over the item if it has the Qt::ItemIgnoresTransformations
+flag and the QGraphicsView had been scaled.
+
+Task-number: QTBUG-17517
+Task-number: QTBUG-22663
+Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2
+Reviewed-by: Andy Shaw
+Reviewed-by: Robin Burchell
+---
+ src/gui/graphicsview/qgraphicsscene.cpp | 10 +++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/gui/graphicsview/qgraphicsscene.cpp
b/src/gui/graphicsview/qgraphicsscene.cpp
+index 14c0f3c..d1cdd4f 100644
+--- a/src/gui/graphicsview/qgraphicsscene.cpp
b/src/gui/graphicsview/qgraphicsscene.cpp
+@@ -1084,7 +1084,7 @@ void QGraphicsScenePrivate::enableMouseTrackingOnViews()
+ /*!
+ Returns all items for the screen position in \a event.
+ */
+-QList QGraphicsScenePrivate::itemsAtPosition(const QPoint
&/*screenPos*/,
++QList QGraphicsScenePrivate::itemsAtPosition(const QPoint
&screenPos,
+ const QPointF
&scenePos,
+ QWidget
*widget) const
+ {
+@@ -1093,12 +1093,16 @@ QList
QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*sc
+ if (!view)
+ return q->items(scenePos, Qt::IntersectsItemShape,
Qt::DescendingOrder, QTransform());
+
+-const QRectF pointRect(scenePos, QSizeF(1, 1));
++const QRectF pointRect(QPointF(widget->mapFromGlobal(screenPos)),
QSizeF(1, 1));
+ if (!view->isTransformed())
+ return q->items(pointRect, Qt::IntersectsItemShape,
Qt::DescendingOrder);
+
+ const QTransform viewTransform = view->viewportTransform();
+-return q->items(pointRect, Qt::IntersectsItemShape,
++if (viewTransform.type() <= QTransform::TxScale) {
++return q->items(viewTransform.inverted().mapRect(pointRect),
Qt::IntersectsItemShape,
++Qt::DescendingOrder, viewTransform);
++}
++return q->items(viewTransform.inverted().map(pointRect),
Qt::IntersectsItemShape,
+ Qt::DescendingOrder, viewTransform);
+ }
+
+--
+1.7.6
+
Added: improved-filter-event
