summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.7' into devv5.8.0-alpha1Liang Qi2016-08-020-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I524e6344bd57ea073c233cfc912bd4969415940d
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: Ib5922f5fa302b6e1b3cf42c37a954dbd09596b5c
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-2818-134/+8
|\ \ \ | |/ / | | | | | | Change-Id: I0a8e242e0c24a67fe60737674dc3a4ecf0936f3a
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-269-35/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h One side narrowed a QNX define to Dinkum; the other wanted the same kludges applied for Intel. Combine their changes to the condition. Change-Id: Id44102e53a0f96b7318437fb47fa76d8bc1119f3
| | * Fix usage of deprecated QStyleOptionViewItemV3v5.6.25.6.2Joerg Bornemann2016-07-051-9/+1
| | | | | | | | | | | | | | | Change-Id: Ie8223958c2e281bd00bacf80c22cc3f7282b42db Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Remove superfluous NDEBUG defineJoerg Bornemann2016-07-041-2/+0
| | | | | | | | | | | | | | | | | | | | | This is already added in WebKit.pri. Change-Id: I6bb2bd9ed20c5cc661847404bc1862314f97a799 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * Remove superfluous include pathsJoerg Bornemann2016-07-041-16/+0
| | | | | | | | | | | | | | | | | | | | | Remove include paths that are already added by JavaScriptCore.pri. Change-Id: I862a806007e8bc6202785a86b014735402830195 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * Update the detection of MSVC versions to be forward-compatibleThiago Macieira2016-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.8 may deprecate the win32-msvc20xx mkspecs, so use the MSVC_VER variable to detect which version of MSVC it is. This commit removes the detection for win32-icc, as it really depended on what version of MSVC headers it was targeting. With Qt prior to 5.8, it was not possible to detect it anyway, so the rule was broken anyway (ICC prior to 16 only worked with MSVC <= 2013, but ICC 17 will work with 2015). Change-Id: Ib57b52598e2f452985e9fffd1459e682978341f5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-173-3/+3
| | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: If04c585cdd374c4fce88ed39b5cc23b0668bd9b7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Switch to debug_thread_t typeJames McDonnell2016-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch from "struct _debug_thread_info" to debug_thread_t. For QNX 7.0, debug_thread_t becomes the architecture independent type. The original type becomes the 32-bit specific version. The type can be changed now because the two types are interchangeable on QNX 6.6.0. Change-Id: I515b2aca73370200cd0401af0f26fc1653a07421 Reviewed-by: Dan Cape <dcape@qnx.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * Make some QNX only code Dinkum specificJames McDonnell2016-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | The undefines won't be needed for QNX 7.0 with GNU libc++. Change-Id: I01bc306c5ebb0cb7f508bb7ee2994589f2936201 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * Compile Fix for OpenBSD in C++11 modeRalf Nolden2016-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a __cplusplus condition to an already existing OpenBSD defined part to activate the code only on older gcc compilers. See commit 32e0c5f96dac3f8afe187259929dd87012e1a464 in qtdeclarative. Change-Id: Ia7846f9058ee94bad160651347c128015e21698e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I8f659fd2676aeedbfe4aaa36b8e9e93c979eee05 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Fix build with the Intel compilerThiago Macieira2016-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ICC's supplied math.h has #defines for isnan and signbit. So work around that. Change-Id: I149e0540c00745fe8119fffd1463d7473c4c1f8a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1v5.7.05.7.0Liang Qi2016-05-199-99/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I59a0b27e74c2a4d9d62727e067abcdaf0fb97e8b
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: I7abf5bb8276fea2f75479a7884b5c6ecc3e41ed2
| | * delete .desktop files of examplesv5.6.1-1v5.6.15.6.1Oswald Buddenhagen2016-04-279-99/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I55f6786bc2463051e97ca55c81309dd2afbf7580 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-0821-54/+17
|\ \ \ | |/ / | | | | | | Change-Id: Ib083ce598299f883ce0dac7f79c1da2d6f0321ec
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-086-0/+0
| |\ \ | | |/ | | | | | | Change-Id: I51a29b9b4b1307dd380126407fa4f5e4c80e127f
| | * Purge sRGB chunks from PNGs.Edward Welbourne2016-03-315-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce (A couple of them needed -force, but did get smaller.) Change-Id: I216fe2a8163fab11f8b8e8ca0fa92c00a94d68bf Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| | * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I3316ed3782abeca59df16f1aa517c134ecb5fa97 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| * | purge symbian vestigesOswald Buddenhagen2016-04-068-38/+1
| | | | | | | | | | | | | | | Change-Id: I3e66ce25ea21aa846b44b6f99b8afbe0959a6526 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-077-16/+16
| |\ \ | | |/ | | | | | | Change-Id: Ib80d7470da24f01d92a9363894ae82aae9e34e28
| | * Make more ctors explicitMarc Mutz2016-03-062-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. One is even a protected ctor. Change-Id: I114b26332ba0e2752f5d02ebcd6090fc2b562b40 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-064-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I7e007ee907c479320a885af329745563c080467d Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-253-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I0cb70c7954b4f23778279d9c6bd8c558b6825d98 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I401cd9db6b487704d54a83b28d5ad1bdea2a3b92
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-155-4/+9
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I125a7421f2d449b5670fbb250ad167d97f156fff
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-152-0/+7
| |\ | | | | | | | | | Change-Id: Idf3aa3e2ec24a79adec9aa964b64c17f034d719e
| | * Use build-in time functions of WEC2013v5.6.0-rc1v5.6.05.6.0Andreas Holzammer2016-02-032-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time functions are supported with WEC2013 and do not need to be implemented. Task-number: QTBUG-50851 Change-Id: I4344b85808bd34467f239bf299b82e969544b7cb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Bump versionOswald Buddenhagen2016-02-081-1/+1
| |/ | | | | | | Change-Id: I9e249aa3456a74f5a6a35626ae9bea04ddc5e4e6
| * Doc: corrected invalid qdoc \relates statementNico Vertriest2016-01-251-2/+0
| | | | | | | | | | | | Change-Id: I6a73ed6b4eeb241be574f0ddc041f554e120003b Task-number: QTBUG-43810 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| * Fix build with clang/c++1z due to register keywordSergio Martins2016-01-241-1/+1
| | | | | | | | | | | | | | dtoa.cpp:794:5: error: ISO C++1z does not allow 'register' storage class specifier [-Wregister] Change-Id: I800ba0eb11fb55db8600a0eb937689e082c41c31 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-beta1Liang Qi2015-11-171-1/+1
| |\ | | | | | | | | | Change-Id: I9eb3f1cd57dd247570b7922ed387d7b72d053558
| | * Doc: corrected link to external source5.5Nico Vertriest2015-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Link to manual Javascript available online. Task-number: QTBUG-48258 Change-Id: I5bf2e8af2f1f5d795a47f82ffe553c174726854b Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-221-0/+1
|\ \ \ | |/ / | | | | | | Change-Id: Iabc282a0396f2403a7a89712be279dd8e894df41
| * | Avoid headersclean on ARM with Boot2QtSimon Hausmann2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This extends commit 5daf90cf1f6ae7f6708649c35b003a87bc7d9f50 to also avoid -Werror with the gcc arm toolchain used for Boot2Qt. Change-Id: Ib2dad074c4d542a4fc22b1e63e2335e1978c02ee Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Dissable headersclean for AndroidBogDan Vatra2015-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reason that I fail to understand Android gcc doesn't like it and it breaks the compilation. Change-Id: Iae8d0c73c95464ac2c02b6d660a7eee3e2492e21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1487-0/+688
|\ \ \ | |/ / | | | | | | Change-Id: If70c0cf0d42c8d94201d8a10ef5724487ad69379
| * | Purge spurious execute permissionsEdward Welbourne2015-09-2985-0/+0
| | | | | | | | | | | | | | | | | | | | | JavaScript and README files are not for running. Change-Id: I0a07b58f5ca28e8ef02421c5f9ca04071f15f9c6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-212-0/+688
| |\ \ | | |/ | | | | | | Change-Id: If343f2bd28e84f22edcbd46f1c588123fe0be574
| | * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.1Liang Qi2015-08-190-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id27995a8aa7eb220d5b4ffdbbc5bd1a8faa656f3
| | | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I927fa62a912d035117e2aa9d3ec36ca823c82d89
| | * | Add the GPLv3 license textThiago 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>
* | | | Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ / / | | | | | | | | | Change-Id: I0cdfb15ac89926c184329ad9e1a3217cdcbba4ef
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-090-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I94c4ed4c39850dbafd400f0aa1114a217f8e8207
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | | | | | Change-Id: I2d9b8deb75e6be1ae91a74726accbfbcccb71a9c
* | | doc: Remove uses of \mainclassMartin Smith2015-06-054-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | This qdoc command is deprecated. Change-Id: I50ebdbfb6d0c445ae4ead0556b9b1b1b0259f860 Task-number: QTBUG-46476 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-033-2/+4
|\ \ \ | |/ / | | | | | | Change-Id: Ic481818c49a01be005daa3860764e24e73d06627
| * | Fix build with MSVC2015.v5.5.0-rc1v5.5.05.5.0Friedemann Kleint2015-05-263-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove os-win32 from the include path since the system headers are now sufficient. - Introduce some #if depending on version for traits and snprintf(). Change-Id: I290b2260e3c1595a7940c76ec2d9a4372709b156 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
View Lorry Controller Status