aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/shared/menuutil.h
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-11-14 11:13:15 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-15 16:08:46 +0000
commitd3545dbdfdb30e310c6c962ba92f4fdf57354666 (patch)
treee56e0a167ee50cb104cb28ed7e6ae730512c55ca /tests/auto/shared/menuutil.h
parent0b5f60148f4992381ae79f399b243ecb2774d2ba (diff)
Revert all Menu delegate patchesv5.12.0-rc2v5.12.0-rc1v5.12.0
This reverts the following commits: d5cb26bc56a3b6f6e99c88654d4f7a65f43551ac - Menu: ensure the correct delegates are used when created via Component d923dd467c1aeb3e195a09949b04862084002f88 - MenuBar: ensure the correct delegates are used when created via Component d56c193eb4ceb640611d66f22e1f26aae91cd7d1 - QQuickPopupPositioner: avoid adding duplicate item change listeners 567a2de8cd493aabe0055d6dbc367b39447e70dd - Stabilize tst_qquickmenubar 953fbac6131823e4fce0eb4707a854469c4c04ff - Fix Instantiator-created MenuItems disappearing 936d31179d44220571ded15840bedeccb581c83b - tst_qquickmenu: add a test for MenuItems before and after a Repeater fc1832810f6c09505d9413685ed0b2d6295bea4a - QQuickMenuBar: fix menu not opening The fix for QTBUG-67559 has caused lots of issues, with the latest being a crash right before the 5.12 release. The bug that they fix is a P2, so it's not worth the hassle. The patches might be able to be resubmitted to dev after the crash is fixed. Change-Id: Ic192c7a302176bcdb2503b636b3462b10898a2ba Fixes: QTBUG-71770 Reviewed-by: J-P Nurmi <jpnurmi@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/shared/menuutil.h')
-rw-r--r--tests/auto/shared/menuutil.h61
1 files changed, 0 insertions, 61 deletions
diff --git a/tests/auto/shared/menuutil.h b/tests/auto/shared/menuutil.h
deleted file mode 100644
index 067b7e55..00000000
--- a/tests/auto/shared/menuutil.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQUICKMENUTUTIL_H
-#define QQUICKMENUTUTIL_H
-
-#include <QtQuick/private/qquickitem_p.h>
-#include <QtQuick/private/qquicklistview_p.h>
-
-/*
- QQuickMenuPrivate::insertItem() culls newly added items to ensure
- that they don't show up when they shouldn't, but now that QQuickMenu
- postpones item creation until after component completion (QTBUG-67559),
- the culled flag being set means that mouse events don't get delivered
- to menu items (see the culled check in QQuickWindowPrivate::pointerTargets()).
-
- ListView unculls the items in FxViewItem::setVisible(), and waiting until
- polishes are finished is a reliable way of ensuring that that happens
- before we send mouse events.
-*/
-#define waitForMenuListViewPolish(menu) \
-{ \
- const auto listView = qobject_cast<QQuickListView*>((menu)->contentItem()); \
- Q_ASSERT(listView); \
- QTRY_COMPARE(QQuickItemPrivate::get(listView)->polishScheduled, false); \
-}
-
-#endif // QQUICKMENUTUTIL_H