diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp | 58 |
1 files changed, 39 insertions, 19 deletions
diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp index 168a17773e..68b847577c 100644 --- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp +++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 +** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** 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$ ** ****************************************************************************/ @@ -66,6 +58,7 @@ private slots: void task230994_iconSize(); void task176137_autoRepeatOfAction(); void qtbug_26956_popupTimerDone(); + void qtbug_34759_sizeHintResetWhenSettingMenu(); protected slots: void sendMouseClick(); @@ -265,5 +258,32 @@ void tst_QToolButton::qtbug_26956_popupTimerDone() tb->showMenu(); } +void tst_QToolButton::qtbug_34759_sizeHintResetWhenSettingMenu() +{ + // There is no reliable way of checking what's ultimately a style-dependent + // sizing. So the idea is checking if the size is the "correct" size w.r.t. + // another toolbutton which has had a menu set before it was shown for the first time + + QToolButton button1; + QToolButton button2; + + button1.setToolButtonStyle(Qt::ToolButtonIconOnly); + button1.setPopupMode(QToolButton::MenuButtonPopup); + + button2.setToolButtonStyle(Qt::ToolButtonIconOnly); + button2.setPopupMode(QToolButton::MenuButtonPopup); + + button2.setMenu(new QMenu(&button2)); + + button1.show(); + button2.show(); + + QVERIFY(QTest::qWaitForWindowExposed(&button1)); + QVERIFY(QTest::qWaitForWindowExposed(&button2)); + + button1.setMenu(new QMenu(&button1)); + QTRY_COMPARE(button1.sizeHint(), button2.sizeHint()); +} + QTEST_MAIN(tst_QToolButton) #include "tst_qtoolbutton.moc" |