AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa Menus: Introducing Menurama manual test

Browse Source 
This manual test pretends to be a modest safeguard
against QMenu related regressions on macOS. It takes
a slightly different approach than the existing menus
manual test, tracking observed regressions instead of
providing extensive coverage (though this may change
in the future).

These regressions are listed as task numbers below,
most of them arising from the now infamous change,

     09acf326db QCocoaMenu: Decouple NSMenuItem from NSMenu

So, from now on, please run this and the menus manual
tests and look for regressions every time you make a
change regarding QCocoaMenu and related. And, if you're
fixing a regression, add the regression example to the
Menurama manual test.

Task-number: QTBUG-52931
Task-number: QTBUG-53085
Task-number: QTBUG-53251
Task-number: QTBUG-54633
Task-number: QTBUG-54637
Task-number: QTBUG-54698
Task-number: QTBUG-55121
Change-Id: I276e916dcdf00f1a44faf64d87050bc3a037a3b5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Gabriel de Dietrich 2016-08-10 17:24:04 -07:00
parent 9e85986fd0
commit 0f61cde4d9
7 changed files with 658 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/manual/cocoa/menurama/main.cpp Normal file
View File

@ -0,0 +1,51 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the qtbase module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "mainwindow.h"
#include "menuramaapplication.h"
int main(int argc, char *argv[])
{
MenuramaApplication a(argc, argv);
MainWindow w;
w.show();
return a.exec();
}

86
tests/manual/cocoa/menurama/mainwindow.cpp Normal file
View File

@ -0,0 +1,86 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the qtbase module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "menuramaapplication.h"
#include <QDebug>
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
{
ui->setupUi(this);
startTimer(1000);
connect(ui->menuAfter_aboutToShow, &QMenu::aboutToShow, [=] {
menuApp->populateMenu(ui->menuAfter_aboutToShow, true /*clear*/);
});
connect(ui->menuDynamic_Stuff, &QMenu::aboutToShow, [=] {
menuApp->addDynMenu(QLatin1String("Added After aboutToShow()"), ui->menuDynamic_Stuff);
});
connect(ui->pushButton, &QPushButton::clicked, [=] {
menuApp->populateMenu(ui->menuOn_Click, true /*clear*/);
});
}
MainWindow::~MainWindow()
{
delete ui;
}
void MainWindow::timerEvent(QTimerEvent *)
{
menuApp->populateMenu(ui->menuPopulated_by_Timer, true /*clear*/);
menuApp->addDynMenu(QLatin1String("Added by Timer"), ui->menuDynamic_Stuff);
}
void MainWindow::enableStuffMenu(bool enable)
{
ui->menuStuff->setEnabled(enable);
}
void MainWindow::on_actionQuit_triggered()
{
menuApp->exit();
}

71
tests/manual/cocoa/menurama/mainwindow.h Normal file
View File

@ -0,0 +1,71 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the qtbase module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#include <QMainWindow>
namespace Ui {
class MainWindow;
}
class MainWindow : public QMainWindow
{
Q_OBJECT
public:
explicit MainWindow(QWidget *parent = 0);
~MainWindow();
protected:
void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
public slots:
void enableStuffMenu(bool enable);
private slots:
void on_actionQuit_triggered();
private:
Ui::MainWindow *ui;
};
#endif // MAINWINDOW_H

289
tests/manual/cocoa/menurama/mainwindow.ui Normal file
View File

@ -0,0 +1,289 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>566</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralWidget">
<widget class="QCheckBox" name="checkBox">
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<width>151</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Enable &quot;Stuff&quot; Menu</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>321</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>The &quot;Help&quot; menu should NOT be visible.</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>10</x>
<y>80</y>
<width>211</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Populate Dynamic Submenu</string>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>566</width>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuStuff">
<property name="title">
<string>Stuff</string>
</property>
<widget class="QMenu" name="menuSubmenu">
<property name="title">
<string>Submenu</string>
</property>
<widget class="QMenu" name="menuMore_Submenu_2">
<property name="title">
<string>More Submenu</string>
</property>
<addaction name="actionMOARH"/>
</widget>
<addaction name="actionWith_More_Stuff"/>
<addaction name="menuMore_Submenu_2"/>
</widget>
<widget class="QMenu" name="menuDisabled_Submenu">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Disabled Submenu</string>
</property>
<widget class="QMenu" name="menuMore_Submenu">
<property name="title">
<string>More Submenu</string>
</property>
<addaction name="actionShould_be_Disabled_Too"/>
</widget>
<addaction name="actionShould_be_Disabled"/>
<addaction name="menuMore_Submenu"/>
</widget>
<addaction name="actionItem"/>
<addaction name="menuSubmenu"/>
<addaction name="actionDisabled_Item"/>
<addaction name="menuDisabled_Submenu"/>
</widget>
<widget class="QMenu" name="menuDisabled_Stuff">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title">
<string>Disabled Stuff</string>
</property>
<widget class="QMenu" name="menuSubmenu_2">
<property name="title">
<string>Disabled Submenu</string>
</property>
<widget class="QMenu" name="menuSubsubmenu">
<property name="title">
<string>Disabled Subsubmenu</string>
</property>
<addaction name="actionWith_its_own_Stuff"/>
</widget>
<addaction name="actionMore_Disabled_Stuff"/>
<addaction name="menuSubsubmenu"/>
</widget>
<addaction name="actionItem_2"/>
<addaction name="menuSubmenu_2"/>
</widget>
<widget class="QMenu" name="menuShould_NOT_Be_Visible">
<property name="title">
<string>Should NOT Be Visible</string>
</property>
<addaction name="actionAbout"/>
</widget>
<widget class="QMenu" name="menuHelp">
<property name="title">
<string>Help</string>
</property>
<addaction name="actionAbout_Qt"/>
</widget>
<widget class="QMenu" name="menuDynamic_Stuff">
<property name="title">
<string>Dynamic Stuff</string>
</property>
<widget class="QMenu" name="menuAfter_aboutToShow">
<property name="title">
<string>Populated After aboutToShow()</string>
</property>
</widget>
<widget class="QMenu" name="menuOn_Click">
<property name="title">
<string>Click Button to Populate</string>
</property>
</widget>
<widget class="QMenu" name="menuPopulated_by_Timer">
<property name="title">
<string>Populated by Timer</string>
</property>
</widget>
<addaction name="menuOn_Click"/>
<addaction name="menuAfter_aboutToShow"/>
<addaction name="menuPopulated_by_Timer"/>
</widget>
<widget class="QMenu" name="menuFile">
<property name="title">
<string>File</string>
</property>
<addaction name="actionNew"/>
<addaction name="actionNo_Empty_Spaces_Below"/>
<addaction name="actionQuit"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuStuff"/>
<addaction name="menuDisabled_Stuff"/>
<addaction name="menuShould_NOT_Be_Visible"/>
<addaction name="menuDynamic_Stuff"/>
<addaction name="menuHelp"/>
</widget>
<widget class="QToolBar" name="mainToolBar">
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
</widget>
<widget class="QStatusBar" name="statusBar"/>
<action name="actionWith_More_Stuff">
<property name="text">
<string>With More Stuff</string>
</property>
</action>
<action name="actionDisabled_Item">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Disabled Item</string>
</property>
</action>
<action name="actionItem">
<property name="text">
<string>Item</string>
</property>
</action>
<action name="actionShould_be_Disabled">
<property name="text">
<string>Should be Disabled</string>
</property>
</action>
<action name="actionShould_be_Disabled_Too">
<property name="text">
<string>Should be Disabled Too</string>
</property>
</action>
<action name="actionMOARH">
<property name="text">
<string>MOAR!!</string>
</property>
</action>
<action name="actionItem_2">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Disabled Item</string>
</property>
</action>
<action name="actionMore_Disabled_Stuff">
<property name="text">
<string>More Disabled Stuff</string>
</property>
</action>
<action name="actionWith_its_own_Stuff">
<property name="text">
<string>With its own Disabled Stuff</string>
</property>
</action>
<action name="actionAbout">
<property name="text">
<string>About</string>
</property>
</action>
<action name="actionAbout_Qt">
<property name="text">
<string>About Qt</string>
</property>
</action>
<action name="actionQuit">
<property name="text">
<string>Exit</string>
</property>
</action>
<action name="actionNew">
<property name="text">
<string>New...</string>
</property>
</action>
<action name="actionNo_Empty_Spaces_Below">
<property name="text">
<string>No Empty Spaces Below</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections>
<connection>
<sender>checkBox</sender>
<signal>toggled(bool)</signal>
<receiver>MainWindow</receiver>
<slot>enableStuffMenu(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>62</x>
<y>94</y>
</hint>
<hint type="destinationlabel">
<x>72</x>
<y>73</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>enableStuffMenu(bool)</slot>
</slots>
</ui>

22
tests/manual/cocoa/menurama/menurama.pro Normal file
View File

@ -0,0 +1,22 @@
#-------------------------------------------------
#
# Project created by QtCreator 2016-08-10T14:21:46
#
#-------------------------------------------------
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = Menurama
TEMPLATE = app
SOURCES += main.cpp\
mainwindow.cpp \
menuramaapplication.cpp
HEADERS += mainwindow.h \
menuramaapplication.h
FORMS += mainwindow.ui

81
tests/manual/cocoa/menurama/menuramaapplication.cpp Normal file
View File

@ -0,0 +1,81 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the qtbase module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "menuramaapplication.h"
MenuramaApplication::MenuramaApplication(int argc, char **argv)
: QApplication (argc, argv)
{
#if 0
QMenuBar *mb = new QMenuBar();
QMenu *menu = mb->addMenu("App Dynamic");
QMenu *dynMenu = menu->addMenu("After aboutToShow()");
connect(dynMenu, &QMenu::aboutToShow, [=] {
qDebug() << "aboutToShow(), populating" << dynMenu;
menuApp->populateMenu(dynMenu, true /*clear*/);
});
#endif
}
void MenuramaApplication::populateMenu(QMenu *menu, bool clear)
{
if (clear)
menu->clear();
static const char *sym[] = { "Foo", "Bar", "Baz", "Huux" };
static int id = 0;
for (unsigned i = 0; i < sizeof(sym) / sizeof(sym[0]); i++)
menu->addAction(QStringLiteral("%1 — %2 %3 ")
.arg(menu->title()).arg(sym[i]).arg(id));
++id;
}
void MenuramaApplication::addDynMenu(QLatin1String title, QMenu *parentMenu)
{
foreach (QAction *a, parentMenu->actions())
if (a->text() == title) {
parentMenu->removeAction(a);
break;
}
QMenu *subMenu = new QMenu(title, parentMenu);
populateMenu(subMenu, false /*clear*/);
parentMenu->addMenu(subMenu);
}

58
tests/manual/cocoa/menurama/menuramaapplication.h Normal file
View File

@ -0,0 +1,58 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the qtbase module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef MENURAMAAPPLICATION_H
#define MENURAMAAPPLICATION_H
#include <QtWidgets>
#define menuApp (static_cast<MenuramaApplication *>(QCoreApplication::instance()))
class MenuramaApplication : public QApplication
{
public:
MenuramaApplication(int argc, char **argv);
void addDynMenu(QLatin1String title, QMenu *parentMenu);
public slots:
void populateMenu(QMenu *menu, bool clear);
};
#endif // MENURAMAAPPLICATION_H