aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* macfunctions: compile fixv5.6.0-rc1v5.6.0-beta1v5.6.0Tim Blechmann2015-11-171-1/+1
| | | | | | | ensure that "-frameworks AppKit" is properly passed as linker flag Change-Id: Iea032e5c3e21588a2c5000f1bfdb26e401ae08c0 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* 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>
* 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>
* Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-212-0/+688
|\ | | | | | | Change-Id: Ic909693b3d4bce334f49d043f2f36678846e6351
| * Add the GPLv3 license textv5.5.15.5Thiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 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>
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-098-20/+44
|\| | | | | | | Change-Id: I74a3560d17364ac8bab4716b9df85a4d96ab5244
| * 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.5' into devLiang Qi2015-06-292-3/+7
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icf1d2bf8c497f966faf8938b8eb9738849a05795
| * Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | Change-Id: Ie565dd9c094874a6369c143ff55809274a38b7ea
| * Examples: fix a function name conflict with QtWidgetLiang Qi2015-06-101-2/+2
| | | | | | | | | | | | Task-number: QTBUG-43213 Change-Id: Ieb1482dd619c7df64cc56b34abdf1e0518c9df14 Reviewed-by: Jake Petroules <jake.petroules@petroules.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>
| | * Bump versionOswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | Change-Id: I4f9e525142cefe421997739723222dc1401c2b70
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-122-3/+0
|\| | | | | | | | | | | Change-Id: I927061263d64f236a2dde6f77cd5d2f034bcaace
| * | Remove the old headersclean unit testv5.5.0-beta1Thiago Macieira2015-03-252-3/+0
| | | | | | | | | | | | | | | | | | | | | We have configure -headersclean now Change-Id: Ie0dc968871203eeaa6019fc2b0ccd7dc78e9fd4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-031-1/+1
|\| | | | | | | | | | | Change-Id: Ifaf12deaae6e7d5c2a2b50674c3ae8446241627f
| * | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1Frederik Gladhorn2015-02-241-1/+1
| |\ \
| | * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-201-1/+1
| | |\| | | | | | | | | | | | | Change-Id: I1f72e5396630a6b78bbed7646e758532edcc6fda
| | | * 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>
* | | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ / / | | | | | | | | | Change-Id: I8e8da943242160b8a76b23b959c64ba884658421
* / / Update copyright headersJani Heikkinen2015-02-1644-421/+333
|/ / | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-161-1/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib0586881ba40d46dc3da5ee4ac93447afd119d01
| * Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: Ie1f7c6bc83899c8c83f376d91dcfc1131390824c
| * 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>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-022-2/+2
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icd08477652d6bea2f00a51f316c68f3e102053e1
| * Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: I67bc09ca32420b3bd3095170469963cfb467d549
| * 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>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-09-198-11/+11
|\| | | | | | | Change-Id: Ia5591669e96fca7f477a39c34573db086d07b221
| * Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-beta1Frederik Gladhorn2014-09-160-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icabe869a513a8784db00fd388332d723f5379cc1
| | * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | Change-Id: I4085d699f5475ecc2c8cb0090b2124480bb9f21d
| * | Doc: Changed instances of "Mac OS X" to "OS X".v5.4.0-alpha1Jerome Pasion2014-09-054-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | -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-014-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | -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>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-2821-999/+654
|\| | | | | | | | | | | Change-Id: Ibc5857ff434f757e1ec6f8fdc382898e51d8f570
| * | Update license headers and add new licensesJani Heikkinen2014-08-2421-999/+654
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ / | | | | | | Change-Id: I08a0c0c41e81decd649dd4829496f787766a4cdf
* | 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>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-262-2/+2
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1db80f61bc3e6314f897352108896adbe49e0f72
| * Merge remote-tracking branch 'origin/stable' into 5.3Frederik Gladhorn2014-06-252-2/+2
| |\ | | | | | | | | | Change-Id: I222b3d468acbf45b1f7b81706e74db8c182869cd
| | * 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>
| * | Bump versionOswald Buddenhagen2014-06-181-1/+1
| |/ | | | | | | Change-Id: I947513f71eecc748d787d5abfceadb52750286ce
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-146-7/+23
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6ed2e85196f9deed63fee493ac1a7a061199c1c9
| * Merge remote-tracking branch 'origin/release' into stablev5.3.1Jani Heikkinen2014-04-236-7/+23
| |\ | | | | | | | | | Change-Id: I56a541591b5be2ab5672735d5fe4e26b98c3d77c
| | * Doc: Improved example documentation.v5.3.0-rc1v5.3.0Jerome Pasion2014-04-164-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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>
| * | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-231-1/+1
| |/ | | | | | | | | Change-Id: I1377ea7bbf7142b01408028d3f53efd7e04264f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-247-50/+63
|\| | | | | | | Change-Id: I11df18cceb1decbd0bf723f9911a5f985eb7d59f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 00:02:30 +0000