summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-04-08 06:57:16 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-04-08 07:28:29 (GMT)
commit7c8672bab9cef0eb9b0a8e3c5c1696dc98b78cc0 (patch)
tree5afd00424ba211d94799d68b25115e5e1cb2e81b
parentdcfef78f9a8be49b71512d47e3bbe076c2beb4c8 (diff)
downloadQt-7c8672bab9cef0eb9b0a8e3c5c1696dc98b78cc0.zip
Qt-7c8672bab9cef0eb9b0a8e3c5c1696dc98b78cc0.tar.gz
Qt-7c8672bab9cef0eb9b0a8e3c5c1696dc98b78cc0.tar.bz2
BT: Revert "Fixes: Remove warnings in the embeddeddialogs demo."
This reverts commit 7d24c0af8e52687b4e5735950495bb25947ca9f0. This change removed the accidental recursion leading to console warnings on Mac OS X by changing the way the scene event filter is registered for popups. But it also broke the behavior of the demo with regards to popup handling, in that the custom proxy no longer can detect popups that close, so dialogs stay zoomed in after the cursor has left. So before, the demo worked but printed warnings to the console on Mac OS X, and after, the warnings were gone but the demo behavior broke on all platforms... The change also accidentally removed the cache mode from the popup; I don't think this was intentional. Reviewed-by: Alexis (cherry picked from commit ccaf16278f4fd422458d01b80579952846e6cf38)
-rw-r--r--demos/embeddeddialogs/main.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/demos/embeddeddialogs/main.cpp b/demos/embeddeddialogs/main.cpp
index a41e4d1..5a0204e 100644
--- a/demos/embeddeddialogs/main.cpp
+++ b/demos/embeddeddialogs/main.cpp
@@ -68,7 +68,6 @@ int main(int argc, char *argv[])
proxy->setCacheMode(QGraphicsItem::DeviceCoordinateCache);
scene.addItem(proxy);
- proxy->installSceneEventFilter(proxy);
}
}
scene.setSceneRect(scene.itemsBoundingRect());