summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-02-021-0/+21
|\ | | | | | | Change-Id: I8905dedd8dbdbbedada82f1d9b5dab700935de35
| * macOS: update macdeployqt documentationSamuel Gaist2018-01-231-0/+21
| | | | | | | | | | | | | | | | | | | | This patch adds missing command line arguments as well as warning for the behavior of the tool regarding the use of the host file system as reference to generate .dmg. Task-number: QTBUG-65844 Change-Id: Ia0d9483fb0cf60073e0f4f5489f2fba6b5675679 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-184-12/+120
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie7684951e10e119872147396d47118b928fce93d
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-182-1/+26
| |\ | | | | | | | | | Change-Id: Ifc2e3f0ccb56d2ae319d5a506073e95debdd2daa
| | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-081-0/+25
| | | | | | | | | | | | | | | Change-Id: I96c4cb64a443a6b245051bafdb246a8ea9387adc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Add arm64 to supported platforms for QNX 7.0Tuukka Turunen2018-01-071-1/+1
| |/ | | | | | | | | | | | | Incorrectly listed initially, arm64 has always worked (Qt 5.9, QNX 7). Change-Id: I760bf4568696631c3497cd86b861b084f26a8e6e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Add Copyright to winmain documentationKai Koehne2017-12-271-0/+2
| | | | | | | | | | | | | | | | The BSD license explicitly references 'Redistributions of source code must retain the above copyright notice', so we also have to show it. Change-Id: I9a4b3965bc94479cb403d515d97c333e0d045bc4 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Android: Add information about LLVM libc++ licenseEskil Abrahamsen Blomfeldt2017-12-211-6/+86
| | | | | | | | | | | | | | | | | | When building with the android-clang mkspec, we will use the MIT-licensed run-time instead of the GPL-licensed one. This was not reflected in the documentation. Change-Id: Icb081218fbc5a1ac63a422dfb06e28ff077204d9 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Don't imply in Supported Platforms that UWP support is mobile-onlyJake Petroules2017-12-191-5/+6
| | | | | | | | | | | | Task-number: QTBUG-63628 Change-Id: I0dea341fd375c77e6fbd147c165a1f8170bbfafa Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | Change-Id: I25886c175933fe4cb0ea8afcb16f69545428c856
| * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+25
| |\ | | | | | | | | | Change-Id: I65584146bc290adea4957b9a1f5d81e3aa7a05a8
* | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: I9aa3fecf2d0aa3acc91efd861279361e20fa823a
* | | Doc: Move notepad example to qtbase/examples/widgets/tutorialsNico Vertriest2017-12-185-809/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove from original location with commit id b6e529c0fc46718d492d915e3f827e07254efcc6 Task-number: QTBUG-60635 Change-Id: If6084dc07d890c438c1cb89065a37eb4186fdbae Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+51
|\ \ \ | | | | | | | | | | | | Change-Id: I483b4ae21a7b9b6b086f209bf4c9554866fbc862
| * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+25
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Id1441bf06a5f8f9875a8bdba17491eee62563340
| | * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-081-0/+25
| | |/ | | | | | | | | | | | | Change-Id: Ia9e3b95961fbc52faeecbda64383cc09406abebc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-203-8/+4
| |\ \ | |/ / |/| | | | | Change-Id: I1e8270b76fdabe0fcb3ef3475e2b51726b2359a8
* | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-153-8/+4
|\ \ \ | | |/ | |/| | | | Change-Id: I336560dac5e92ee40e4b1bb9a5ed15aba080a81b
| * | Fix outdated FDL license headerKai Koehne2017-11-071-3/+3
| | | | | | | | | | | | | | | Change-Id: I612bcadea11f2ed87016e8ed4cc52ec3e0fa5be1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Remove mention of Apache Ant from Android documentationJake Petroules2017-11-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This no longer applies and has not for a while. Gradle is now used, and included automatically. Change-Id: Ic9c85329d75383b8dbf997a968f53a314f48c1e7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Modernize the example for using asset catalogsJake Petroules2017-11-031-4/+1
| | | | | | | | | | | | | | | | | | Change-Id: I10d31e3cf74ec5faa6d5c1a7bc635ffbe2880a96 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * Add changes file for Qt 5.10.0Antti Kokko2017-11-141-0/+26
| |/ |/| | | | | | | Change-Id: Ia25344ea00a919d5066814101b6f808964837944 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Doc: Remove reference to App Chooser exampleNico Vertriest2017-11-071-1/+0
| | | | | | | | | | | | | | | | | | This widget example has been deleted. See 43f80da4d4ef648ba20e3bb6f1c2218e8f992aa6 Task-number: QTBUG-60635 Change-Id: Iab4f64023c99e969168120fa3c9927e58d710396 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3013-47/+140
|\ \ | |/ | | | | Change-Id: I8a9563bdc315764ccdd5087864c3a8186902411f
| * Be more explicit on where qt licenses are storedKai Koehne2017-10-193-12/+35
| | | | | | | | | | | | | | | | | | | | Mention that the Qt Licenses are nowadays usually fetched automatically. Anyhow, if this goes wrong be more explicit on where the files are searched and how to work around things. Change-Id: I9f58f99170f85ba236d7f28f18d51c77d23d1956 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Fix outdated FDL license headerKai Koehne2017-10-173-14/+14
| | | | | | | | | | Change-Id: I6a61963bd6a8b57100a12ad924e383e81d80f854 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix outdated BSD license headerKai Koehne2017-10-177-21/+91
| | | | | | | | | | Change-Id: I84b17d5d6e19b88943c4e8011fae47060a0abda8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2Liang Qi2017-10-1536-287/+1039
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4cde0b3e88dcfe741b4d1150f1f7b4e6a96e1430
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: I7a727a54d15a9628909062d07d14c1a17c4f6256
| * Merge "Merge branch 'tqtc/vxworks-5.5' into 5.9" into refs/staging/5.9Jake Petroules2017-10-062-1/+534
| |\
| | * Merge branch 'tqtc/vxworks-5.5' into 5.9Jake Petroules2017-09-282-1/+534
| | |\ | | | | | | | | | | | | Change-Id: I10c8b5da4334cb3cb44af14a8c3bb1fd06a60eda
| | | * VxWorks: Update VxWorks version to SR0480 2016-09-16tqtc/vxworks-5.5Tuomas Heimonen2016-12-221-2/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I97c4b431b5f0bb1a0753cbefcf7724dcb6dab34b Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | | * Doc: Clarify how Qt for VxWorks source package is deliveredTopi Reinio2016-05-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iced2554b8225da929d3c805f277bea9c028708c8 Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com> Reviewed-by: Marko Kangas <marko.kangas@theqtcompany.com>
| | | * VxWorks: Doc: List all supported add-on modulesTopi Reinio2016-02-041-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And link to the module landing pages. Change-Id: Ia8ddc90e37d0d135e4ce2edfc82d93ee8f12df2f Reviewed-by: Marko Kangas <marko.kangas@theqtcompany.com>
| | | * VwWorks: Doc: Fix minor issuesTopi Reinio2016-02-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a link to contact-us page and some minor formatting issues. Change-Id: I56c81bac7c8da4952208e75b3ff99d456bd4598f Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
| | | * VxWorks: Updated documentationPasi Petäjäjärvi2016-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update configure example Change-Id: I6a53c2c030487bc340be315be5a7af4ea413b56c Reviewed-by: Tuomas Heimonen <tuomas.heimonen@theqtcompany.com>
| | | * VxWorks: Update documentationPasi Petäjäjärvi2016-01-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add chapter for env variable QT_FORCE_SELECT_NOTIMEOUT Change-Id: Id71397e1f28d883fc4aa82a67caa296f60c3c258 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | | * VxWorks: Update documentationPasi Petäjäjärvi2016-01-281-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix input device format * Remove unsupported features for keyboard Change-Id: I097c7c5e7fffa012ffbedc73acf465b0f8152baa Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | | * VxWorks: Update documentationPasi Petäjäjärvi2016-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add QSound as supported c++ class Change-Id: Iaa6fe6855470cbb65f0fd9dcc9ecc4ee1bb87530 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | | * VxWorks: Update documentationPasi Petäjäjärvi2016-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in Scene Graph Rendering Thread section Change-Id: Ifcb54285e9be64988b91e32a15dca1f60610ade0 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | | * VxWorks: Update documentationPasi Petäjäjärvi2016-01-131-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated minimum supported VxWorks 7 release * Updated touch support section Change-Id: Iee84f3081eeaec14269854b5dbf64daf49183ec2 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | | * VxWorks: Update documentationPasi Petäjäjärvi2016-01-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add QML loader thread section Change-Id: Ib475c80b69a13817e291775fa2e2a0c84d6c05fb Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | | * Merge branch '5.5.1' into vxworks-5.5Pasi Petäjäjärvi2015-10-053-11/+15
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 5.5.1: Integrating JavaScript in QML: add missing colon. Fix some issues with MOC documentation. Update 'Qt for Windows - Building from Source' docs. Change-Id: I12efc3401467083ae0d240cb2f9df596f617c690
| | | * \ Merge branch '5.5' into vxworks-5.5Pasi Petäjäjärvi2015-08-2622-738/+735
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 5.5: Document issues with Touch Screen Input and Weston Fix grammar in supported platforms docs. Add the GPLv3 license text Fix reference to non-existent JavaScript documentation. iOS: Fix launch image code sample and explanation Doc: remove Xcode and OS X version for iOS development Add missing options to the uic documentation Doc: replace Mac OS X with OS X Doc: cmake-manual: Update module variables Bump version Remove BlackBerry related documentation. List The Qt Company as owner of Qt trademarks Licensing: Replace Digia by The Qt Company Doc: iOS platform notes: Fix missing \endcode command Add mention of BSD license code used in QImage::transformed Doc: Fix class name mentioned in licensing documentation Change-Id: I3a48df2200c0dce7ec65076e1a64eefd233c6de6
| | | * \ \ Merge branch 'vxworks-5.5.0' into vxworks-5.5Pasi Petäjäjärvi2015-08-267-120/+172
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vxworks-5.5.0: Doc: Update information on supported platforms Add changes file for 5.5.0 release VxWorks: Update documentation WinRT: Update platform documentation Doc: Document forkfd and FreeBSD 3rd party licenses Change-Id: If9751026b2b029fa28ab1b72ca5bdcda9f4f6572
| | | | * \ \ Merge branch '5.5.0' into vxworks-5.5.0Pasi Petäjäjärvi2015-07-036-113/+125
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 5.5.0: Doc: Update information on supported platforms Add changes file for 5.5.0 release WinRT: Update platform documentation Doc: Document forkfd and FreeBSD 3rd party licenses Conflicts: doc/src/platforms/platform-notes-rtos.qdoc Change-Id: I3499c5b93148042baf13a726007a0766a4031dd8
| | | | * | | | VxWorks: Update documentationPasi Petäjäjärvi2015-06-111-7/+47
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add instructions howto start Qt5 application on VxWorks * More documentation about shared/static build of Qt5 Change-Id: I7844bdecad06a16e870e742a374cc7c80c0a53e2 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | | * | | | Merge "Merge branch 'upstream-5.5' into vxworks-5.5" into vxworks-5.5Oswald Buddenhagen2015-06-0516-102/+93
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'upstream-5.5' into vxworks-5.5Pasi Petäjäjärvi2015-06-0316-102/+93
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-5.5: Prospective fix for cmake docs after -fPIC -> -fPIE changes Doc: update the moc docs as to what can't be used with class templates Use make as make sub-src is no longer valid for Qt 5 Update the Android OpenGL notes Doc: Added \keyword entries for console.xxx Doc: Link to Qt Visual Studio Add-in documentation Doc: Update Qt Modules page and related information Doc: Fix missing/broken links in Intro and What's New pages Update deployment information for ffmpegsumo.dll on Windows. Update the QNX platform notes Update the getting started topic Bump version Doc: Removed a few redundant steps based on the latest Qt Creator ver Change-Id: Ifdd4bf7d14dfbb5b2ab52a4ac058a59e94feb185
| | | * | | | | | VxWorks: Update documentationPasi Petäjäjärvi2015-06-031-12/+91
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add supported architecture * Add supported Qt modules and add-ons Change-Id: I6954c8d9128965a52c3fa39aafc3038ace20d919 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>