From 20994f94c592de3e5c023d79c244937ab23f56de Mon Sep 17 00:00:00 2001 From: Dmytro Tyshchenko Date: Thu, 14 Mar 2013 12:09:04 +0100 Subject: Add function toNSMenu() to get NSMenu handle from QMenu object. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also added test for this function. Task-number: QTBUG-28869 Change-Id: Ia9674dc28b614029423f3f9eb8fd1c8f62b9bcba Reviewed-by: Harri Porten Reviewed-by: Morten Johan Sørvig Reviewed-by: Laszlo Papp --- tests/auto/auto.pro | 2 + tests/auto/macfunctions/macfunctions.pro | 12 ++++ tests/auto/macfunctions/tst_qtmacfunctions.mm | 85 +++++++++++++++++++++++++++ tests/tests.pro | 2 + 4 files changed, 101 insertions(+) create mode 100644 tests/auto/auto.pro create mode 100644 tests/auto/macfunctions/macfunctions.pro create mode 100644 tests/auto/macfunctions/tst_qtmacfunctions.mm create mode 100644 tests/tests.pro (limited to 'tests') diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro new file mode 100644 index 0000000..998e36a --- /dev/null +++ b/tests/auto/auto.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = macfunctions diff --git a/tests/auto/macfunctions/macfunctions.pro b/tests/auto/macfunctions/macfunctions.pro new file mode 100644 index 0000000..c34a9ed --- /dev/null +++ b/tests/auto/macfunctions/macfunctions.pro @@ -0,0 +1,12 @@ +QT += testlib + +TARGET = tst_qtmacfunctions +CONFIG += console +CONFIG -= app_bundle + +TEMPLATE = app + +include (../../../src/qtmacextras.pri) + +OBJECTIVE_SOURCES += $$PWD/tst_qtmacfunctions.mm +LIBS *= -framework AppKit diff --git a/tests/auto/macfunctions/tst_qtmacfunctions.mm b/tests/auto/macfunctions/tst_qtmacfunctions.mm new file mode 100644 index 0000000..eab6683 --- /dev/null +++ b/tests/auto/macfunctions/tst_qtmacfunctions.mm @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2013 froglogic GmbH and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtMacExtras module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 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 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include + +#import + +class tst_QtMacFunctions : public QObject +{ + Q_OBJECT + +public: + tst_QtMacFunctions(); + +private slots: + void testQMenuToNSMenu(); +}; + +tst_QtMacFunctions::tst_QtMacFunctions() +{ +} + +void tst_QtMacFunctions::testQMenuToNSMenu() +{ + QMainWindow window; + QMenu *qMenu = new QMenu("Menu", &window); + QAction *action = new QAction("&Item", &window); + qMenu->addAction(action); + window.menuBar()->addMenu(qMenu); + + NSMenu *nsMenu = toNSMenu(qMenu); + QVERIFY(nsMenu != NULL); + QCOMPARE([[nsMenu title] UTF8String], "Menu"); + + NSMenuItem *item = [nsMenu itemAtIndex:0]; + QCOMPARE([[item title] UTF8String], "Item"); +} + +QTEST_MAIN(tst_QtMacFunctions) + +#include "tst_qtmacfunctions.moc" diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 0000000..7fbc8a9 --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = auto -- cgit v1.2.3