summaryrefslogtreecommitdiff
path: root/src/controls/qquickmenuitem.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Build fix for -no-feature-shortcutPaul Olav Tvete2017-03-031-0/+2
| | | | | Change-Id: I63f1990f72d0eb736c5e1ecba5574bb13f9ef127 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* "to the empty string" => "to an empty string"Mitch Curtis2017-03-011-3/+3
| | | | | | Change-Id: I62f1fae431ce02c196c6ca582e0d033dbf38d836 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Note that iconName requires QApplicationMitch Curtis2017-03-011-0/+2
| | | | | | Task-number: QTBUG-37083 Change-Id: I3091776f4b4643136e67c9521efddb5462657d06 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Controls: append "1" to all C++ classesMitch Curtis2016-03-181-41/+41
| | | | | | | | | | This is consistent with the classes that have already had this done. It prevents clashes with Qt Quick Controls 2. These classes are not available to the user, so it doesn't affect compatibility. Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Disable platform menus on XCBJ-P Nurmi2016-02-251-1/+1
| | | | | | | | | | Context menus and combobox popups no longer work with QDBusPlatformMenu, which only works in the global menubar or system tray icon. Change-Id: I65d037c8eb9e8f0f462ddc2dfb36843c062714b3 Task-number: QTBUG-51372 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Unify license header usageAntti Kokko2016-02-041-12/+15
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Suffix QQuickMenu, QQuickMenuBar & QQuickMenuItem with 1J-P Nurmi2015-12-161-29/+29
| | | | | | | | This avoids clashes between Qt Quick Controls and Qt Labs Controls. Change-Id: Ia1d367c271a3c80259d4f59be891c211ec061e01 Task-number: QTBUG-49794 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QQuickExclusiveGroup to QQuickExclusiveGroup1Mitch Curtis2015-11-031-2/+2
| | | | | | | | | | This avoids clashes between Qt Quick Controls and Qt Labs Controls. No other classes have this problem, as this is the only class with the same name as that of one in Qt Labs Controls. Change-Id: I6223e6b42654330abda7942dc5c7a2b3ad942b70 Task-number: QTBUG-48240 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Simon Hausmann2015-10-021-0/+5
|\ | | | | | | Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
| * Menus: Clean popup hide and destroy logicGabriel de Dietrich2015-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a menu popup gets closed it usually needs to be destroyed right away since we don't recycle its contents. There is an exception, however, and it's when he user triggers a menu item. In this case, we need to proceed in three steps. First, we hide the menu popup, then we emit the triggered signal, and when that one returns, the menu contents can be disposed. If we did all in a single step, we may end up with a crash since we don't support deleting a QtQuick item while it's running a signal handler. Delayed deletions don't work either in the case when the triggered handler ends up running the event loop. Task-number: QTBUG-45182 Task-number: QTBUG-47682 Task-number: QTBUG-48382 Change-Id: Ic39717e09f38df602f641250cd81cf4931863db6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: Create proper QHP TOC entries for QML types, examples and tutorialsTopi Reinio2015-08-051-0/+2
|/ | | | | | | | | | QDoc now supports using a \group name as a selector for QHP subprojects. Use this to have the correct division of Qt Quick Controls and Controls Styles QML types, as well as a TOC entry for examples and tutorials. Change-Id: I8e4b44c8876fd6bb3b2baebd956d6dc5d5223715 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: Fix qml method signaturesCaroline Chao2015-03-131-1/+1
| | | | | | | | | | So the return value and parameters can be seen in the documentation. + Fix minor doc issues Change-Id: I99e520c103bb0faeb88b26eb7b9ff73922851abc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Controls: update license headersJ-P Nurmi2015-02-111-15/+18
| | | | | | | Change-Id: I77e7a218a958d76ac7ef7780f4be52a81f76fa6b Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Doc: link issues qtquickcontrolsNico Vertriest2015-01-161-2/+4
| | | | | | Change-Id: I42b98f9394267cf56930edc13d9942bda6ebfcda Task-number: QTBUG-43810 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Update license headers and add new license filesAntti Kokko2014-08-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I470909ba0980db33ab551790d619c59a35978590 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Doc: Added images and missing snippetsVenu2014-06-271-0/+34
| | | | | | Task-number: QTBUG-33799 Change-Id: I582518a73276d47cf63cf31411b5176a90acab6f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* MenuItem: Don't delete owned bound actionsGabriel de Dietrich2014-03-181-6/+1
| | | | | | | | | | | They may be referenced from somewhere else, and there's no reason not to keep them alive while the MenuItem is alive. Task-number: QTBUG-37554 Change-Id: Idaab616c856348c0b7eeb1a2e9fdc5bfc3f8a5fd Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Append handler names to \qmlsignal documentationSze Howe Koh2014-03-181-0/+4
| | | | | Change-Id: I5e06bdf03ba1ba8e5fe7669f690420dc9a039129 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* MenuItem: Update platform menu item when checkable changesAndrew Knight2014-03-101-2/+13
| | | | | | | | This is required to inform the platform backend to change the menu item's appearance. Change-Id: I326ac2d79b4f9e7646c2c01b7f41662310736b18 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* MenuItem: use queued connection to trigger() - avoid deletion crashShawn Rutledge2014-02-051-1/+1
| | | | | | | | | | | If a ListView's delegate launches a context menu which deletes the corresponding model item, the MouseArea which launched the context menu gets deleted while handling an event. That is not allowed, so a mechanism is necessary to postpone the deletion. This works for now. Task-number: QTBUG-36653 Change-Id: Idb78ddb830f229e2006f53fc993f1aee8fb2dc15 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Menu: Don't create platform item for QQuickMenuItemContainersGabriel de Dietrich2013-12-171-11/+14
| | | | | | | | | | They don't have any QPA counterpart as they're just plain containers. This also removes that "Menu does not contain the item to be removed" warning on Mac. Task-Number: QTBUG-32197 Change-Id: I06e08817194c2e3ad3efd7ded193bfac9d3a1948 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add source QObject to QQuickAction's triggered signalDaiwei Li2013-09-191-1/+1
| | | | | | | | | Based on a suggestion from Gabriel de Dietrich. Knowing the source object that triggered an action is useful for analytics purposes. Change-Id: I11f62214fa669a91769a0ce25b0c11c0fc0635d0 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Merge branch 'stable' into devGabriel de Dietrich2013-09-181-0/+9
|\ | | | | | | | | | | | | Conflicts: src/controls/qquickaction.cpp Change-Id: I85255ba5c27c0d8ea023d0867e5963d43f8f1ddb
| * Menu: Enable mnemonic menu navigationGabriel de Dietrich2013-09-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | We also added a new mnemonic specific shortcut context matcher. This prevents two menu items with the same mnemonic but within different menus to be reported as ambiguous. Task-number: QTBUG-33030 ChangeLog: Added mnemonic navigation for menus Change-Id: I192c9aacba4d15851fe65bf9201251962fe976d5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Set the menu role for the QPlatformMenuItem to the defaultAndy Shaw2013-09-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | QAction has a default menu role which is passed on to the QPlatformMenuItem. But as QtQuickControls does not use QAction, we need to set the default menu role explicitly to TextHeuristicRole. This fixes the merging of menu items on Mac. Task-number: QTBUG-31883 Change-Id: I24f0e265f8ceca376db9970d62e8f79a646fef3b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Update imports to 1.1 and remove version from qmlmodule definitionJens Bache-Wiig2013-09-101-2/+2
| | | | | | | | | | Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Support StandardKeys for Action/MenuItem::shortcutJ-P Nurmi2013-08-201-8/+25
|/ | | | | | Change-Id: I2054a59fcda26795721e5d7d04cc644220da372b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Buttons: Allow overriding of visual properties when 'action' is setGabriel de Dietrich2013-06-031-1/+1
| | | | | | | | | | Those properties are, text, tooltip, iconName, and iconSource. Also, properly capitalized gallery's tooltips. Change-Id: I1995a85565edd7aaa420279821d7c1a31ef18253 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Fixes warningsCaroline Chao2013-06-031-5/+5
| | | | | | | | | | | Fixes issues including: - Misspelled links - Links to signal with arguments - \table in SplitView.qml - Links to current file Change-Id: I2cbadf661a641f19ed55f6854922b2b69966bc9c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* MenuItem: Connect to own action's 'shortcutChanged' signalGabriel de Dietrich2013-05-291-0/+1
| | | | | | | | Otherwise, we won't be setting the shortcut on the platform item. Task-number: QTBUG-31368 Change-Id: I333b903719d6e95a411f4f423c0e9b8ce15e640e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Menu: Remove items from menu on destructionGabriel de Dietrich2013-04-181-0/+2
| | | | | | | And vice-versa, including containers. Change-Id: I97cfc7a55327d5f5c5e0eb4befb246b0bccb2c32 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Rename QtMenuXxx to QQuickMenuXxxJ-P Nurmi2013-04-151-0/+607
Change-Id: I89aa205686f0bdf2b267ad17a8ae0470c2f4751f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
View Lorry Controller Status