aboutsummaryrefslogtreecommitdiffstats
path: root/src/macextras
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix documentation issues when using Clang-enabled QDocv5.11.0-beta4Topi Reinio2018-04-124-0/+18
| | | | | | | | | | | | | | | QDoc in Qt 5.11 uses Clang to parse the C++ source for documentation comments. Unlike the old parser, Clang requires a module header to be present as well as correct include paths to generate the docs correctly. However, these are available from the build system only when building on macOS, not when generating the documentation on another system (e.g. Linux). To fix this, create a 'dummy' module header specific to doc builds and add required relative include paths and DEFINEs to .qdocconf. Change-Id: Iadc1475d16c5570b86de7ea8e17bfeb02d8412eb Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-204-88/+59
|\ | | | | | | Change-Id: I259a7f40415bfad4168c4e777583c9d777f40003
| * Use FDL license for .qdoc filesKai Koehne2017-09-293-87/+48
| | | | | | | | | | Change-Id: I673f6d5df99a0646e95dbe5aa89fbc2c0e7aac4d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Fix outdated BSD license headerKai Koehne2017-09-291-1/+11
| | | | | | | | | | Change-Id: If7364382dd0accd892390f8021c7c8dcf9a6cad0 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-272-3/+3
|/ | | | | Change-Id: Ib81fb687a84fe745d769ba3783b1bcf11ed7975e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add undeclared Foundation dependencyJake Petroules2017-06-201-0/+2
| | | | | | Task-number: QTBUG-61489 Change-Id: Ibdf381e89214b1eea4d334159c0cf18de166bc30 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Liang Qi2017-03-101-0/+1
|\ | | | | | | | | | | | | Conflicts: src/macextras/macextras-lib.pri Change-Id: Iee350318a9e396fe1188823b6cae7e154da029af
| * add missing QtWidgets dependency on macos5.8Oswald Buddenhagen2017-02-011-0/+1
| | | | | | | | | | | | Task-number: QTBUG-58538 Change-Id: Ib446c33e2ba796374478f3df36f4b35957ddfcd7 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Fix platform conditions across entire modulev5.9.0-alpha1Jake Petroules2017-02-092-36/+36
| | | | | | | | | | Change-Id: Id63420244eecd5935b7fa7c82b6ad9e0e48ad0f1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | Properly fix unavailable APIs in App Extensions errorJake Petroules2017-02-092-4/+2
| | | | | | | | | | | | | | | | This reverts 20d1d8d097333ec6d13a0dd0c46aeab1bdacb50a. Task-number: QTBUG-58743 Change-Id: I1ec803948246889bb4aed1a0d934fdc6918cb52d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Disable extension-API checkTor Arne Vestbø2017-02-091-0/+2
|/ | | | | | | | | The module uses sharedApplication. Task-number: QTBUG-58743 Change-Id: Ic28099cba31d79d9dee2cf29cb99bfbe26b0cb21 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-265-6/+6
|\ | | | | | | Change-Id: Ica8ae5b03d57d4bf043644e8818523e68c959c57
| * Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-09-175-6/+6
| |\ | | | | | | | | | Change-Id: I127063e9dd558bcb8d46ea08fe1e4ae10af3f891
| | * Doc: Change instances of 'OS X' to 'macOS'v5.6.2Topi Reinio2016-08-125-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase), except in link targets (QDoc doesn't expand macros in those). Add a 'macOS' prefix to example titles to make it clear they are specific to that platform. Change-Id: I6bac8d92ca080adf7138a12e0f792c132e382f5d Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freev5.8.0-beta1Marc Mutz2016-09-062-2/+2
|/ / | | | | | | | | | | | | 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-05-191-1/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2330fade4f257fc58a9906e98fc17da889ce62ea
| * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.1Topi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I2b7019feee874946491ce887d8048e01ba68e0c9 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-082-3/+3
|\| | | | | | | Change-Id: I0201f0f090d9d976bd1abe0105a51cd2f7fb91f0
| * Make more ctors explicitMarc Mutz2016-03-222-2/+2
| | | | | | | | | | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: I954ba09a2defb509f527a876b9f11028e8413ad7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I832c3e6f411280643004dc6dd9361b2ea63a6dca Task-number: QTBUG-45291 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-072-6/+6
|\| | | | | | | Change-Id: Id5a322f8f448b5a654456e7a99ed1e02f1c434b0
| * standardize statement order in project file a bitOswald Buddenhagen2016-02-251-3/+6
| | | | | | | | | | Change-Id: Ib5bd2c3cb9fdf0d6ad087bd5e0b0e3096168c72c Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| * remove redundant load(qt_build_config)Oswald Buddenhagen2016-02-251-1/+0
| | | | | | | | | | | | | | it's loaded by .qmake.conf already. Change-Id: I81f64102febbde07c2e9456be6b5f4788088e598 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| * 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-151-1/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2ac62377ea3b053dea70d4ab706823c2113085e2
| * Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I0e1bf28912cc56fe7fabbb6b23df84f715aa3cab Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Updated license headersAntti Kokko2016-01-2018-252/+360
|/ | | | | | | | | | 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>
* Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-095-0/+55
| | | | | Change-Id: I230babbf8063a514ec017335c30f0c53637894fb Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@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>
* Include cleanupSamuel Gaist2015-07-164-6/+11
| | | | | | | | This patch corrects the include generating warnings on build as well as module wide include. Change-Id: I1135175c015f1ddbaa8fa024f7d325805974cbb4 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Fix documentation generationSamuel Gaist2015-07-154-14/+33
| | | | | | | Task-number: QTBUG-36985 Change-Id: I9e6a6fdc3fa4802f690317782b054151a8f6087d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-rc1v5.5.0Liang Qi2015-05-261-1/+5
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I769ed6443b24c3329f614807d91bcfdde93939f9
| * Release the CGImageRef as this is no longer required5.4Andy Shaw2015-05-261-1/+5
| | | | | | | | | | Change-Id: I837869f739032ddea60e7e894795c921cbf730db Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@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-1622-261/+197
|/ | | | | | | | | 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: clarify that macextra is OSX only, it is skipped on iOSv5.4.0-rc1v5.4.0Fawzi Mohamed2014-10-302-2/+2
| | | | | | | Change-Id: I0a02bb7c0b6eb33647db3c1b2e8becffe26d8410 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Doc: Changed instances of "Mac OS X" to "OS X".v5.4.0-alpha1Jerome Pasion2014-09-053-4/+4
| | | | | | | | | -the official name is "OS X" and this change is only for the documentation. Macros and API are untouched by this commit. Change-Id: Ibdcfe2b8460685a6f8f895548288571dbb6e8a1d Task-number: QTBUG-40759 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Fixed broken links caused by "OS X" rename in qtdoc repo.Jerome Pasion2014-09-011-1/+1
| | | | | | | | | -article was renamed to use "OS X" from "Mac OS X". Task-number: QTBUG-40759 Change-Id: I7eb9549883f6ba3be46120e4759e603752a3eb30 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Update license headers and add new licensesJani Heikkinen2014-08-2410-185/+105
| | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I7ad600e0dbf455da7381f991ed09acafd63b89b2 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-3/+4
|\ | | | | | | Change-Id: I409a2a711361d3ccb7ffcecf5bfb1820afa64338
| * 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>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
|/ | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I652075a29aa3035fdedaddfef07b484dfb73ff70 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Include cleanupstableSamuel Gaist2014-06-222-2/+2
| | | | | | | This patch corrects the include generating warnings on build Change-Id: I943da0ec630ec85a36c3be6dbb570ea90799678b Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Doc: Improved example documentation.v5.3.0-rc1v5.3.0Jerome Pasion2014-04-161-2/+2
| | | | | | | | | | | | -updated copyright year -added instruction for running the example from within Qt Creator (using \include) -added links to relevant pages -qdocconf change needed for \include Task-number: QTBUG-33597 Change-Id: I19ab712d0e74503d618c49633951d1628f822668 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Deprecate QByteArray <=> NSData converters for 5.3Samuel Gaist2014-04-142-2/+6
| | | | | | | | | | The NSData conversion functions have been moved to QtCore so deprecate their use in QtMacExtras. Change-Id: I0e78b32c803a2856366d15302c96014af3ef4c34 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Document obsolete from/toNSData functionsv5.3.0-beta1Samuel Gaist2014-03-101-0/+10
| | | | | | | | | | | This patch adds the obsolete documentation for fromNSData and toNSData to conform to the documentation process. See comments in the bug report Task-number: QTBUG-36985 Change-Id: I7a9b69fa99c8b53c002a95bd9c70cc64006cd59e Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Removed duplicate NSString NSURL conversion functionsv5.3.0-alpha1Samuel Gaist2014-02-256-50/+14
| | | | | | | | | | | 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>
* Document qtmacextras functionsSamuel Gaist2014-02-242-0/+39
| | | | | | | | | | | | This patch aims to provide the missing Qt Mac Extras documentation The conversion functions (e.g. NSData <=> QByteArray) are not documented because they will either be moved to QtCore or removed from QtMacExtras since already present in QtCore Change-Id: I364be524966b353602bcf88218d9bb81042497ff Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 22:26:00 +0000