summaryrefslogtreecommitdiffstats
path: root/src/controls/qquickmenubar.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Disable platform menus on XCBJ-P Nurmi2016-02-251-0/+4
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-211-19/+19
|\ | | | | | | | | | | | | Conflicts: src/controls/qquickmenubar.cpp Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
| * Suffix QQuickMenu, QQuickMenuBar & QQuickMenuItem with 1J-P Nurmi2015-12-161-19/+19
| | | | | | | | | | | | | | | | 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>
* | Replace foreach with range-based forAnton Kudryavtsev2016-01-161-2/+2
|/ | | | | Change-Id: Ieb9019b62696479a4e0317a590bceaeb30abf62c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickMenuBar: Remove native menus from native menubar on destructionGabriel de Dietrich2015-07-271-2/+9
| | | | | | | | | | The native menus are deleted because they're usually children of the menubar. But we still keep references in QCocoaMenuBar until we manually remove those form the menu list. Change-Id: I1651852b6ebc578ca308d69299de4c12764f7363 Task-number: QTBUG-47233 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.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>
* Fix QQuickMenuBar::setNative()J-P Nurmi2014-09-221-1/+11
| | | | | | | | | | Due to evaluation order, menus can be appended to the default property before the native property is set => sync the items as appropriate. Technically it's now even possible to toggle between a native and non-native menubar even though it doesn't sound like a sane use-case. Change-Id: I513f133a085ffd980a4000afe2a992cb47b7448e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Let MenuBarStyle control whether a native menubar is usedJ-P Nurmi2014-09-151-3/+16
| | | | | Change-Id: I1daecf82421ffa330d050430d6e54e4cc0122913 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@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>
* Update imports to 1.1 and remove version from qmlmodule definitionJens Bache-Wiig2013-09-101-1/+1
| | | | | Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Rename QtMenuXxx to QQuickMenuXxxJ-P Nurmi2013-04-151-0/+138
Change-Id: I89aa205686f0bdf2b267ad17a8ae0470c2f4751f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>