summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-02-18 15:35:52 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-24 12:01:31 +0100
commit74d4fcea4a83933f9f2fcc9ff6a54f1c1e59382e (patch)
tree7b69443d74825b40551ad25ff86db9f9d07fb64f
parent0c9c43c1483dbe8146f05a8df6ccb15f15a8f403 (diff)
Enable QMenu::setNoReplayFor(QWidget *noReplayFor) for all platforms.
This prevents a tool button menu from being opened by a replayed click. This partially reverts 8301c0002280c10970cce1e17f634e74c61f2f5d . Task-number: QTBUG-36863 Change-Id: I396e3694de8b3d4ca916457c2b2df39798502530 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--src/widgets/widgets/qmenu.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index edfeb840b1..2820608621 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -3173,11 +3173,7 @@ void QMenu::internalDelayedPopup()
*/
void QMenu::setNoReplayFor(QWidget *noReplayFor)
{
-#ifdef Q_OS_WIN
d_func()->noReplayFor = noReplayFor;
-#else
- Q_UNUSED(noReplayFor);
-#endif
}
/*!\internal