summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Liang Qi2015-05-292-40/+8
|\ | | | | | | Change-Id: Iecd8ad4a73e8439fb1b372c51c49709f2c513aac
| * Prospective fix for cmake docs after -fPIC -> -fPIE changesv5.4.25.4.2Simon Hausmann2015-05-272-40/+8
| | | | | | | | | | | | | | | | | | | | | | | | As a follow-up to qtbase commit 083c9269ed73e8771e1dbe10812696b45b7389f3, cmake versions older than 2.8.12 require now the use of Qt5<Module>_EXECUTABLE_COMPILE_FLAGS and the use of cmake's POSITION_INDEPENDENT_CODE feature is not wanted anymore, as it adds -fPIE to the build flags, which may override -fPIC and thus cause a build issue when including qglobal.h. Change-Id: I4dd6e2ea64f5d8ca8a87f874322bc1b1f8ff5392 Reviewed-by: Stephen Kelly <steveire@gmail.com>
* | Use make as make sub-src is no longer valid for Qt 5Andy Shaw2015-05-221-1/+1
| | | | | | | | | | | | Change-Id: I44079cdf2dfe729a12c1a320baa220e74c6d8d05 Reviewed-by: Karim Pinter <karim.pinter@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4.2' into 5.4Liang Qi2015-05-183-30/+38
|\ \ | |/ | | | | Change-Id: Ib2a07b99b59e1c9e5e7fcb275e6905772c421ba7
| * Update the getting started topicLeena Miettinen2015-05-062-10/+24
| | | | | | | | | | | | | | | | | | | | Update the instructions to describe the unified Qt installer and mention the Qt Account. Partially cherry-picked from commit 20b037af0243e7b4757898ae1f577dbde6913f59 Change-Id: Id21179558e2e6366366d6c9a0b094eba14b87ef3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Merge 5.4 into 5.4.2Oswald Buddenhagen2015-04-202-19/+44
| |\ | | | | | | | | | Change-Id: I186cc0901baf7345a081af7c4a75e404d3a1a69c
| * | Doc: Removed a few redundant steps based on the latest Qt Creator verVenugopal Shivashankar2015-04-162-20/+14
| | | | | | | | | | | | | | | Change-Id: I02df290356cc838eca28faf5269e0b792866a83f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | Doc: Added \keyword entries for console.xxxVenugopal Shivashankar2015-05-131-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These \keyword entries should list the corresponding topics for console.xxx in the help index. Task-number: QTBUG-45090 Change-Id: I734672ec2dae86f6d253ae66acba01a5c06bce93 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Update the QNX platform notesAndy Shaw2015-05-131-4/+2
| | | | | | | | | | | | | | | | | | Change-Id: I6bb863572b37856151484de0f1301d2055ebe12e Reviewed-by: Karim Pinter <karim.pinter@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Bump versionOswald Buddenhagen2015-04-201-1/+1
| |/ |/| | | | | Change-Id: I8296f1d6d10e6a2bbddcb97bcfc9c17a8c99bb88
* | Doc: Update libpng version to 1.6.17 in 3rd party license docsTopi Reinio2015-04-132-19/+44
|/ | | | | Change-Id: I6180dca46f424a17a6f3f8b1f0441fdfbcb2e7ff Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Fix typo in CMake Manual.Florian Bruhin2015-04-071-1/+1
| | | | | | Change-Id: Ia3a6d164c920b4c707bccbe81e5ddd802504fee1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Doc: Added selectors for the subprojects definedVenugopal Shivashankar2015-03-301-0/+3
| | | | | | | | | | | | | QDoc adds all the available nodes to the tree if there are no selectors for the subproject. This change avoids that and lists only the subproject title page entries under the main project in assistant, as there are no matching entries based on the chosen selectors. Change-Id: I282370d289fa4084ee1f383fe00dcd57da9e2f3e Task-number: QTBUG-43074 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: some minor link issuesNico Vertriest2015-03-101-1/+1
| | | | | | Task-number: QTBUG-43810 Change-Id: If7ba03efcc06dab002eceb681488b09fe23fe8b1 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Replace qt-project.org/doc with doc.qt.ioSergio Ahumada2015-03-061-1/+1
| | | | | | Change-Id: I1b66d7ef7b671ff87f57c4ccd4af4b0bb0f9a3d5 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Adjust wiki links to the new redirectSergio Ahumada2015-03-038-18/+18
| | | | | | | it looks nicer this way Change-Id: If13b98e58bcba8efbeb7c306e2de43554611e6b3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-02-278-18/+18
| | | | | | Change-Id: I2c883e501484ba3120f401cff54968023bc24391 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Improve QML performance documentation.Mitch Curtis2015-02-191-6/+6
| | | | | Change-Id: Iceb2e38cf2f7064ff5409fcc75d3a58842a28623 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* threads doc: clarification about QObjects created before QApplication.Alan Ezust2015-02-171-11/+13
| | | | | | | | | | http://permalink.gmane.org/gmane.comp.lib.qt.user/13470 threads doc: clarification about QObjects created before QApplication. Change-Id: I337f8b784749d2999800a289b631691c9ae9798d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Doc: Remove unused image filesTopi Reinio2015-02-16804-33412/+0
| | | | | | | | Remove image files not used in the documentation, including the entire contents of doc/src/diagrams. Change-Id: Ia3fb6be7f4a8b9056fbce65c14b52e42146b9f84 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into ↵Frederik Gladhorn2015-02-105-8/+8
|\ | | | | | | refs/staging/5.4
| * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-105-8/+8
| |\ | | | | | | | | | | | | | | | | | | Conflicts: LICENSE.GPLv2 Change-Id: If9f48f3dcee827a68c965ed77dc3fee7d65c24e5
| | * Merge 5.4 into 5.4.1v5.4.15.4.1Oswald Buddenhagen2015-01-1615-27/+145
| | |\ | | | | | | | | | | | | Change-Id: I06b079e9ad2482af1081d1c58cb8f487ad0fc5c8
| | * | Bump year to 2015Kai Koehne2015-01-136-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Id8476a91c6a2d04a69ba97ec4c058cf803b6d204 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | | Doc: Rename and update the Supported Platforms pageTopi Reinio2015-02-1010-24/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the Supported Platforms page to 'Community Supported Platforms', link to the separately-maintained page for platforms officially supported by The Qt Company, and update the language on the page. Specifically, - Mention Qt Quick 2D Renderer as an alternative to running Qt Quick on OpenGL-enabled platform - Drop the mention of Qt Quick 1 (deprecated) - Replace 'Digia' with 'The Qt Company' where suitable - Update links to this page Change-Id: I9affd7f5b7d13e85d6a945188b29bab64dc172f3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | | Doc: Update Qt logo in generic code sample thumbnailTopi Reinio2015-02-101-0/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the thumbnail image used for generic code samples to have the new Qt logo. This image is visible in Qt Creator's list of examples. Change-Id: I355fae8e60019e10e8b468c2625ff3f754cf2ec6 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | Replace blog.qt.digia.com with blog.qt.ioSergio Ahumada2015-02-062-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: Iffa5dadb283df999f1bb9d95779e77bdca1f4036 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com>
* | | Doc: correct link issues qtdocNico Vertriest2015-02-034-5/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: Ifa10aee95f51d0c55b4f793b7e68dd8306edf2a2 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Fix link to use the right one on the new websiteAndy Shaw2015-02-031-2/+2
| | | | | | | | | | | | | | | Change-Id: Ia681b04e2d1ded91ce3805b8b5d14a1311f27a63 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | remove unnecessary LICENSE.GPLv2Jani Heikkinen2015-01-291-292/+0
| | | | | | | | | | | | | | | Change-Id: I6ce7861a0c5f32b719483ab2fa013e5ce682e7bf Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* | | Don't duplicate the documentation about QT_MESSAGE_PATTERNOlivier Goffart2015-01-191-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | This copy of the documentation is out of date. Just redirect the user to the actual up to date documentation Change-Id: Ia72ff03856d1d799f8b367b028154b6af08575a3 Reviewed-by: David Faure <david.faure@kdab.com>
* | | Bump versionOswald Buddenhagen2015-01-161-1/+1
| |/ |/| | | | | Change-Id: I1276e06671147f0757329dddc05449c9392b5a11
* | Doc: corrected link errors qtdocNico Vertriest2015-01-1511-20/+18
| | | | | | | | | | | | Change-Id: I557a2f7c71f98457f0c8a1a6c2a6e3a46f975e74 Task-number: QTBUG-43537 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Doc: Mention Value-Add and Tech Preview modulesTopi Reinio2015-01-153-0/+113
| | | | | | | | | | | | | | | | | | | | Discuss and link to the modules that are not part of the Qt release in - All Qt Modules page - Qt Reference Pages listing Change-Id: I88b40aadca92c0df6a60e51550f280f9189031a6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: Fix incorrect link to container classes on 'Core Internals' pageTopi Reinio2015-01-131-1/+2
| | | | | | | | | | | | | | | | | | | | Use the module name for the link command to link to the list of container classes under Qt Core. Task-number: QTBUG-43622 Change-Id: I1f55f1a19a36a5250a9d8c6d08116685c07d6e36 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
* | Update documentation on ANGLE.Friedemann Kleint2015-01-081-6/+12
|/ | | | | | | Task-number: QTBUG-43263 Change-Id: I10ca5c565406b3ba7fefabc03542c98f8f6693fb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Doc: Add Qt WebEngine Widgets to the module and example listsSze Howe Koh2015-01-022-1/+7
| | | | | | | This module is new in Qt 5.4. Change-Id: Ia01915d1274b394b1e7905e1f2c21c63e711331a Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* plugin how-to: Fix hyperlinkSergio Martins2014-12-241-1/+1
| | | | | Change-Id: I0f9d2b75fed860b5a6c657b6409b57c2a43710a8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Mention Q_INIT_RESOURCE in the plugin how-to.Sergio Martins2014-12-231-0/+2
| | | | | | | Change-Id: I165f2f62693152a2ef94109a983dfd2513b58467 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Mark QtDBus as cross platformAlex Blasche2014-12-192-5/+6
| | | | | | | | In addition fixes a broken link to qdbuscml2cpp and improves IPC topics list based involved modules Change-Id: Ic414599166b8085189efd8e598ce3a68dce0a439 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-12-175-18/+286
|\ | | | | | | Change-Id: I95c6aa408327f565606b7ee579becb6d07cc520d
| * Doc: Update external links to point to doc.qt.iov5.4.05.4.0Topi Reinio2014-12-033-6/+6
| | | | | | | | | | | | Task-number: QTBUG-43062 Change-Id: Idcca1ee428cbe1d51c6306ad4265f8dd32d80f2d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Add 5.4.0 changelog for qtdocTopi Reinio2014-12-031-0/+34
| | | | | | | | | | Change-Id: I46b2ac71473aad572da62c624cd1f15e2daf4670 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Doc: added brief statement to modules overviewNico Vertriest2014-12-021-0/+1
| | | | | | | | | | | | Task-number: QTBUG-42682 Change-Id: I6167c7659f081a58f32195b7f2d3550e8fa7a379 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * ios: explain how to define icons and launch images, smaller fixesFawzi Mohamed2014-11-301-12/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - how to add icons and launch images in the .pro, so that one does not need to do it in Xcode in a brittle way that will be lost when the xcode project is regenerated, - clarify how to use assets catalogs, - clarify that creator can be used in some places. Task-number: QTBUG-42049 Change-Id: Ia8b9d95526c0de4098c5f06eb5817dc7734f216e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: I6c0146f459e74596dabb1b69c8d1bc16364cb1e0
* | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-2711-131/+296
|\ \ | |/ | | | | Change-Id: I10a73c7f3011e8d9ee40d9b19be3a7d463515bda
| * Doc: Update licensing documentationTopi Reinio2014-11-272-6/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about the following licenses: - libjasper version 2.0 (qtimageformats) - Mesa llvmpipe software rasterizer Also, remove the use of '\generatelist legalese' command from the licensing docs, as it results in duplicate entries. Task-number: QTBUG-42173 Task-number: QTBUG-42711 Change-Id: Ie8a60e01a597fa4c28adf251e8fecd222d3de468 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Doc: Changed layout to use the empty spaces efficientlyVenu2014-11-279-75/+156
| | | | | | | | | | | | | | | | | | | | | | | | - Added images and text within \raw HTML tables to remove the default background and size restrictions. - Replaced the controls gallery example screenshots with the latest ones. - Added a screenshot of the Qt WebEngine nano browser example - Fixed a few typos Change-Id: Ie0d03916db98ef0ad88e6f92e51177a5a8260c9a Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Update sqlite version in 3rdparty licensesKai Koehne2014-11-251-1/+1
| | | | | | | | | | Change-Id: Ied6ae240fa8660f5914abfa17c0920ea7a9365ed Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
View Lorry Controller Status