aboutsummaryrefslogtreecommitdiffstats
path: root/src/macextras/qmactoolbar.mm
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-0/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Idca6a0f78bcb543d55d7bd0d70c99d1071af484c
| * Update obsoleted functionality in preparation for Qt 6Tor Arne Vestbø2021-07-161-0/+1
| | | | | | | | | | | | | | | | | | Functionality that is obsoleted without a replacement will have instructions in the Qt 6 porting guide. Change-Id: I2e456abf7029244553c5157c6d9f018a968e3655 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-231-20/+20
|/ | | | | | | | | | | This reverts commit fa52d41e3861715ec2418225946d56e39d783900. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I6e9bea104d5cf5289152fb592273f31f0b3bcd7d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-271-20/+20
| | | | | | | | | | | | | | | Updated header.COMM to the file in tqtc-qtmacextras. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4169 Change-Id: I6a50040df036bb22491ee8acca04a72e476224dc Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freev5.8.0-beta1Marc Mutz2016-09-061-1/+1
| | | | | | | In the examples, replaced a Q_FOREACH with QList<QByteArray>::join(). Change-Id: I6b1ca1666bf0a69c6489f970da19b3f966327cdb Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-2/+0
|\ | | | | | | Change-Id: Id5a322f8f448b5a654456e7a99ed1e02f1c434b0
| * Fix double deletion of Mac toolbarSimon Hausmann2016-02-241-2/+0
| | | | | | | | | | | | | | | | The QMacToolBarPrivate destructor also calls release on the toolbar. Change-Id: If3a4feb9e08a01b56fb3983c813d4d2e22d71fd2 Task-number: QTBUG-51309 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-201-14/+20
|/ | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ib1e8528c43e103ce71a4555228a34466c41e2695 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Correct compile errors in sample code.Morten Johan Sørvig2015-08-201-2/+2
| | | | | Change-Id: I6cdccbd856f2e2b7180d369985ab83fc85415e22 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Fix documentation generationSamuel Gaist2015-07-151-1/+1
| | | | | | | Task-number: QTBUG-36985 Change-Id: I9e6a6fdc3fa4802f690317782b054151a8f6087d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1Frederik Gladhorn2015-02-241-1/+1
|\
| * Doc: document parameter 'items' in QMacToolBar::setItems()v5.4.2Sergio Ahumada2015-02-201-1/+1
| | | | | | | | | | Change-Id: I642edbe714ed261acdb439ed749b435204bb735f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Update copyright headersJani Heikkinen2015-02-161-22/+14
|/ | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ic70e215d0e32bb8bd5a17a2619854e7987aa6f57 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Doc: link issue in Qt Mac Extrasv5.4.1Nico Vertriest2015-01-121-1/+1
| | | | | | Change-Id: Ibb85f6485a211b6610e451a37c821eb5a211a28d Task-number: QTBUG-43741 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Removed an unnecessary page command from the class documentationv5.3.2Venu2014-07-281-3/+4
| | | | | | | | | | | QDoc failed to generate docs for QMacToolBar as its class documentation had an unnecessary \fn instance within the \class comment block. Replaced the \fn instance with \l. Change-Id: Id36e6c9749f3d0a08c0d2a6dd73cb9bd44cac0af Task-number: QTBUG-40459 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Removed duplicate NSString NSURL conversion functionsv5.3.0-alpha1Samuel Gaist2014-02-251-1/+2
| | | | | | | | | | | Currently there's a duplication of the QString <-> NSString and QUrl <-> NSURL functions. This patch removes the private implementation and updates the code to to use QtCore's functions directly. Change-Id: I8fa613ac6753cc16fedd208f676f39ee2fec6bfa Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Use setNSToolbar from the cocoa platform pluginMorten Johan Sørvig2014-02-101-2/+8
| | | | | | | | | The platform plugin will attach the toolbar to the NSWindow when the NSWindow is created. Change-Id: I550516a240df1f8ae94da2a225d9f63c76fffc6b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Rewrite the Mac native toolbar classes.Morten Johan Sørvig2014-02-101-0/+327
Rename the classes to QMacToolBar and QMacToolBarItem. (Keep the Qt-style ToolBar name capitalization.) API-review and document a core set of the API, remove the rest. Missing functionality can be added back later on. Add a simple QWindow-based mactoolbar example that shows the core toolbar functionality. Add manual test for more comprehensive testing. Make the QToolbarItem properties actually work, you can now change the text and icon after the toolbar has been displayed. Update license headers. Change-Id: I99fb207df7f1b3cf0d5df178aa863c77cd372a1f Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 14:00:21 +0000