summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-2811-89/+123
|\ | | | | | | | | | | | | Conflicts: doc/src/legal/licenses.qdoc Change-Id: Id0fb35581b32d98cc9172a7eea6f6e2375cee1f0
| * Fix layout of license table for Qt QmlKai Koehne2016-11-181-3/+3
| | | | | | | | | | | | | | | | | | Correct wrong layout introduced in commit 65022ba780dd: Each module needs to have an even number of rows, and the module name should span all of them. Change-Id: I729b4ef04eee5a24dd4fecfbe28e64e5944faf27 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Update qtmain library license informationKai Koehne2016-11-183-15/+28
| | | | | | | | | | | | | | | | | | | | | | The qtmain library is now available under commercial licenses, too. Furthermore remove license from table with 3rd party code - it is already linked to under 'Additional Information'. Finally, fix description, and remove incorrect reference to 'QAxContainer'. Change-Id: I8a5ee2af54676260289a94524ef4bb080d94ec55 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Remove mentioning of Drag&Drop code that got removed in Qt 5Kai Koehne2016-11-151-15/+0
| | | | | | | | | | | | Change-Id: I0cf2f4012e42134b9495e8becf3009db8bc4f9ee Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * remove dependencies from sync.profileOswald Buddenhagen2016-11-141-9/+1
| | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Ie52771b596d5aecb811b8570e5d2af9500cdda31 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Link to new Qt VS Tools instead of Qt Visual Studio Add-inLeena Miettinen2016-11-112-3/+3
| | | | | | | | | | Change-Id: I4cc71bdb535c1b5201fbebdec49a3160ce5c3c66 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Document 3rd party code in qtypetraits.hKai Koehne2016-11-092-0/+45
| | | | | | | | | | | | | | Note that the code got removed in 5.8. Change-Id: Iea84e01464ba3d695978fc4360c6e8550956ab0b Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Doc: give the clipping section of the performance docs a targetMitch Curtis2016-11-011-0/+1
| | | | | | | | | | | | | | | | | | There is another section in "Qt Quick Scene Graph Renderer" whose title is "Clipping", and since it's in the same module, it gets picked up first. Avoid the ambiguity altogether by using a target. Change-Id: I640766f7555ea9dd34239cb8822c170779d34c40 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Reword comment about Fusion style recommendationJake Petroules2016-10-201-1/+4
| | | | | | | | | | | | | | | | | | | | This is completely out of place here and has led to users being confused about the support status of other styles (i.e. do Windows and macOS styles not support high-DPI?) Done-With: Morten Sørvig <morten.sorvig@qt.io> Change-Id: I46948962a7ae0d137ca99181b52f7d8851b75400 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * licenses.qdoc: Fix grammar issue in documentationFrederik Schwarzer2016-10-171-1/+1
| | | | | | | | | | Change-Id: I5268e631b4469deeb5f23f0e736cde21a6f5f849 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Doc: Mention the need to run 'make install' for a prefix buildVenugopal Shivashankar2016-10-131-35/+33
| | | | | | | | | | | | Change-Id: I9e4e6db98dc31f62bb21680ce7761c2da3c0e72d Task-number: QTBUG-51392 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Fix link to Plug & Paint example in windows deployment docsKai Koehne2016-10-061-1/+1
| | | | | | | | | | Change-Id: I8f1d2edac1dc1e77cbc691f19a2fd9cd2cf161c5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * gettingstartedqml.qdoc: fix typos in documentation tutorialFrederik Schwarzer2016-10-061-2/+2
| | | | | | | | | | Change-Id: Id3f43a04d24a353bf26e63b6757bf3ea7ff64c93 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * gettingstartedqml.qdoc: fix wrong comment markers in tutorial exampleFrederik Schwarzer2016-10-051-3/+3
| | | | | | | | | | Change-Id: Id4e14276ff15ce20364db2fb6921de27d6c3e491 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * gettingstartedqml.qdoc: add id to element in example codeFrederik Schwarzer2016-10-041-0/+1
| | | | | | | | | | | | | | | | This id is referenced within the same code example, so it is easier to understand this way. Change-Id: Ie0255ee8e0e84b93626ccf406f8ad11dbc5a010e Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-246-24/+51
|\ \ | | | | | | | | | Change-Id: I1166ae57d05286d978fe38d9d706ecb72d8cb38c
| * | Add changes file for 5.7.1v5.7.15.7.1Topi Reinio2016-10-271-0/+27
| | | | | | | | | | | | | | | Change-Id: I562b0d682b27407754ad23bfb578ed839e80779a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Doc: Update information on installers, Qt Account and license keysTopi Reinio2016-10-105-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify the operation of online and offline installers, and how users can manage the licenses during installation. Update the license file-related information in 'Building from Sources' docs. Update the Qt Account portal address. Change-Id: I0437aad9000f15f2c3ad4fb9c0e9bd7096619b3c Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Tuukka Turunen <tuukka.turunen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Doc: List VxWorks in the list of Platform ReferencesTopi Reinio2016-10-282-3/+9
|/ / | | | | | | | | | | | | | | ... and add an external link to the VxWorks documentation (as it's maintained separately). Change-Id: I57adc4b3e9e5912a050410fe6c8433c58cd9adab Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Update QML Coding Conventions to mention semicolon usageMitch Curtis2016-10-062-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The concensus to use semicolons for blocks of code was reached on the mailing list: http://lists.qt-project.org/pipermail/development/2016-October/027441.html Change-Id: I98ce87c623c189bdfac8cfac5c0fa80e5a831c18 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-012-9/+9
|\ \ | |/ | | | | Change-Id: Ia6863344f15b4507bbe4d36aff44463362f5694e
| * Remove claim we support iOS 5.0Alex Blasche2016-09-291-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the explicit mentioning of 5.0 and replaced it with a link to the official list of supported platforms. This reduces the risk of forgetting left over version indications. The same treatment was given to the device list. We only mention the general type of device from now on. The assumption is that both conditions together, device type and minimum OS version, will define the list of supported devices. Change-Id: Ia9f318ad1f1952025e3736589749943193172d86 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Fix list of supported compilers on Windows 10Oliver Wolff2016-09-201-2/+3
| | | | | | | | | | | | | | Change-Id: I547c51f0da75bcae5b7266f76deeae9d60bc1dc3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add UWP to list of supported platformsOliver Wolff2016-09-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | While Windows 8.1 distinguishes between Phone and WinRT this is no longer true for Windows 10 devices. By using Microsoft terminology we clearly state that our goal is to target every UWP device (mobile phones, "desktop" machines, HoloLens, XBox One, ...). Change-Id: Idd84bfd96c5ca1ec56658e9a42ff95edcef6bd09 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-1931-163/+200
|\ \ | |/ | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc doc/src/platforms/supported-platforms.qdocinc Change-Id: I307862d8c442c871fe1da1cbcb43518e98402ca5
| * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-161-0/+28
| |\ | | | | | | | | | Change-Id: Iaf88fb6b424fcbccd52a31c423a76f53ff81344b
| | * Add changes file for 5.6.2v5.6.25.6.2Jani Heikkinen2016-09-091-0/+28
| |/ | | | | | | | | Change-Id: I1774a9dc43b297ebb4f8d6a88822db10679ad3c2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Change instances of '(Mac) OS X' to 'macOS'Topi Reinio2016-08-1230-159/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | 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). Also, fix the usage instructions for related Q_OS_* macros. Change-Id: I5bac6f787a4c434d7ff83036a2cfea4eef41cdc1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Doc: Supported Platforms: Update MinGW version to 5.3.0Topi Reinio2016-08-301-5/+5
| | | | | | | | | | | | Task-number: QTBUG-54079 Change-Id: I811178bf4a9ffea716dd837539d8053672197988 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-109-65/+42
|\ \ | |/ | | | | | | | | | | Conflicts: doc/src/platforms/windows.qdoc Change-Id: Ieba4e6823fef1c7b8d36064110f2469895512941
| * Ant is (still) needed only on WindowsBogDan Vatra2016-08-101-1/+1
| | | | | | | | | | | | | | On Linux & Mac is used gradle Change-Id: Idbe03ef75ce53c5a204147e1e620c50daaab50ba Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Deployment: Link to list of 3rd party licensesKai Koehne2016-08-081-0/+2
| | | | | | | | | | | | Change-Id: Ib04c3cf193cdeba089043f736d2d7a7fa30848e2 GPush-Base: fa09c0b5738d5284db0e1fcdff8ed648755dc588 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Deployment: Mention QML modulesKai Koehne2016-08-081-0/+3
| | | | | | | | | | Change-Id: I14f288ee68c1dd533f6cf18f7b049036ccfc0a64 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Update Qt logosFriedemann Kleint2016-08-054-0/+0
| | | | | | | | | | | | Task-number: QTBUG-55137 Change-Id: Ic021aba06977d7f3c6fa8c616a1d453f01e7d0ce Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Doc: Generate All QML Modules page correctlyTopi Reinio2016-08-051-10/+5
| | | | | | | | | | | | | | | | | | Instead of relying that each QML module has remembered to use the correct \ingroup command, use '\generatelist qml-modules' to list all QML modules that qdoc is aware of. Change-Id: I16442eabea1b7c61f9ed6b7b8fb921a417d1178a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Deployment: Clarify that Qt can be part of the systemKai Koehne2016-08-051-2/+2
| | | | | | | | | | | | | | | | It's not always true that Qt isn't part of the system libs, especially for embedded systems. Change-Id: I99abaf1198cf04ec7899f2f11f092ee49d3ef4fe Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Deployment: Remove mentioning of plugandpaint exampleKai Koehne2016-08-051-3/+1
| | | | | | | | | | | | | | It got moved to platform specific pages. Change-Id: I952a6342f15b01f9c938c1839d22b9d058124cad Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Deployment: Remove Qt libraries tableKai Koehne2016-08-051-34/+0
| | | | | | | | | | | | | | It's incomplete, and doesn't serve any direct purpose. Change-Id: I08e85ebca1f084e0e051cce9132ebf6661fe3209 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * embedded: Add rpi output env var doc and reword the paragraphLaszlo Agocs2016-08-041-7/+12
| | | | | | | | | | Change-Id: Ibd1516d65dde9fcfaef102f7e1fa2ce1dba8b358 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * windeployqt: Mention that it changes Qt5Core.dll path'sKai Koehne2016-08-031-2/+12
| | | | | | | | | | | | Task-number: QTBUG-54575 Change-Id: Iad6536e26f5be6f1fb68f271702ea740ef267e06 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Windows: Fix deployment of ICUKai Koehne2016-08-031-8/+4
| | | | | | | | | | | | | | | | | | | | Qt Core doesn't link against ICU anymore by default since Qt 5.5, and with Qt WebKit dropped from the 5.6 release there's no reason to still discuss ICU as a 'hard' dependency. Change-Id: I90672586dd97a6b43d317de8ccadb70ca7ca9729 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Move deploying Qt WebEngine apps on Windows to Qt WebEngine moduleLeena Miettinen2016-08-041-16/+2
| | | | | | | | | | | | | | | | Placing all Qt WebEngine deployment information in the module docs makes it easier for the team to keep the information up to date. Change-Id: I8e7c1b2b5d4e5592fab3396225f1295fc05ec99d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Doc: Move Qt QML from the GPL-only section to the LGPL sectionSze Howe Koh2016-08-021-8/+8
| | | | | | | | | | | | | | | | | | Commits 6a62948 and 8203e05 on different branches created an undetected conflict, which made it look like Qt QML is not available under the LGPL Task-number: QTBUG-54516 Change-Id: I41abe25043181ff1e7599f0fa162dbb16660f397 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Update Android platform notes with correct versionEskil Abrahamsen Blomfeldt2016-08-021-7/+2
| | | | | | | | | | | | | | | | Since Qt 5.7.0, we have supported Android 4.1 and up, but the platform notes had not been updated. Change-Id: If28c8560688d205385ccf0df8f513ea01f98ba53 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Doc: Remove Value-Add Features from the ReferenceTopi Reinio2016-08-021-7/+1
| | | | | | | | | | | | | | All except Qt for Device Creation are now Qt modules. Change-Id: If092aa48be0a69377fa1525cd419c0cff732b4ef Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Doc: Fix online sidebar link to MultimediaTopi Reinio2016-08-021-1/+1
| | | | | | | | | | Change-Id: I0742db52fb31aa0aa3c0ba008f1cf55244321127 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-0115-43/+82
|\ \ | |/ | | | | | | | | | | | | Conflicts: doc/src/legal/3rdparty.qdoc doc/src/platforms/emb-linux.qdoc Change-Id: I8fcdb28b51438b5135cd31176bc635a6daad269b
| * embedded: Document opt out from signal handlingLaszlo Agocs2016-07-261-0/+14
| | | | | | | | | | | | Task-number: QTBUG-54733 Change-Id: I38843c93b5cc6e7ff9999e86b2fb06d05b2801cb Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Not all modules are available on all platforms/configurationsKai Koehne2016-07-201-0/+4
| | | | | | | | | | | | Task-number: QTBUG-49900 Change-Id: I50aab25b90cda91e6fbfede1bc183c7f37216ab3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Update Qt Creator screenshot in Development Tools topicLeena Miettinen2016-07-191-0/+0
| | | | | | | | | | Change-Id: I07eb75e08235f60d2ab24fe8f1c0d8a109fd4845 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
View Lorry Controller Status