summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-162-4/+1
|\ \ \ | |/ / | | | | | | Change-Id: I42c37ff61d79826c4dd1ee8e4d3816b9b4929bdd
| * | Remove the old headersclean unit testv5.5.0-beta1Thiago Macieira2015-03-182-4/+1
| | | | | | | | | | | | | | | | | | | | | We have configure -headersclean now Change-Id: Iadc179632e128cb0d6fd72c0b1541371b032e4d4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-172-4/+35
|\ \ \ | |/ / | | | | | | Change-Id: Icbbf8cc78ef730c6ea6fbc02136a2d0a8f9690c5
| * | Add verbose messages date conversion tests of tst_QScriptEngine.v5.5.0-alpha1Friedemann Kleint2015-03-111-4/+31
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-44885 Change-Id: Iac155df75cba2402919f30dce2fa794025f396ce Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-031-0/+4
| |\ \ | | |/ | | | | | | Change-Id: I09519da51f8c3cbc927f64f9b1bd7de14b8a1854
| | * Detect PowerPC little-endian architecturev5.4.25.4.2Dmitry Shachnev2015-03-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from commit 405022cf7bba9bb702b9385dbcb983c789c838b1 in qtwebkit. Change-Id: I3be3719d26e47b182612f254f7117125a8be7f4a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-0315-14476/+36555
|\ \ \ | |/ / | | | | | | Change-Id: I40f101a5c2668acafab90b94445d114b43a89a8e
| * | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Frederik Gladhorn2015-02-2415-14476/+36555
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-2015-14476/+36555
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: LICENSE.GPLv2 Change-Id: Ibb3f412a7b9d898910f6f3857e90ecbc86677dab
| | | * remove unnecessary LICENSE.GPLv2Jani Heikkinen2015-02-191-292/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie86b15ea92d23781f5b952dcc89579f2b95c7525 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
| | | * bic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64Sergio Ahumada2015-02-1314-14184/+36555
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ia32 data since there are no linux x86 machines in the CI system (which makes the data useless from an automated testing point of view) and most people use x64 these days anyway. Change-Id: I2f4f1ebfe48b13ba65aef65c579a7fb3c0d9e969 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | | Use QByteArray::toDouble() instead of qstrtod.Erik Verbruggen2015-02-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to use a secretly exported symbol. Change-Id: I3336d57def315e1de1a25dfecbadcaf2459fc039 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ / / | | | | | | | | | Change-Id: I4ac7681eeef1c84e73ac2162aad5da492f7500b1
* | | Fix BSD license headerSergio Ahumada2015-02-191-2/+2
| | | | | | | | | | | | | | | Change-Id: Id8f996f28618845a8b253f5162bec7df98921ef0 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | Fixed license headersJani Heikkinen2015-02-1751-151/+151
|/ / | | | | | | | | Change-Id: I99e62a707fe649403214436a4b9aad8fd82015ee Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-1316-64/+126
|\ \ | |/ | | | | Change-Id: Ic32f5bd17782285305aaa01694f1a78851b882eb
| * Autotest: Use QFINDTESTDATA to find test dataRainer Keller2015-01-192-3/+1
| | | | | | | | | | Change-Id: If33c0f93576b1a3b4ce395156a51df564156deb4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Doc: Moved the example documentation to correct locationsNico Vertriest2015-01-1914-61/+125
| | | | | | | | | | | | | | | | | | | | And fix the \snippet commands to use the correct paths. Also edited dependencies qdocconf files Task-number: QTBUG-43810 Change-Id: I3c2fb6d2a48900a9b5651225381707c9ec25065a Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Update copyright headersJani Heikkinen2015-02-12323-1942/+1918
| | | | | | | | | | | | | | | | | | 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: Iffc10aac2cdaf7c7ceba051ec447f15758c3d8e0 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-191-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7b5322df40680614250e1e6327879ff683c03df5
| * Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: Iaac75269e48783982eb722b3386978e97da2062e
| * Disable pthread_np.h on BSD w/ GNU libcv5.4.15.4.1Pino Toscano2015-01-121-1/+1
| | | | | | | | | | | | | | | | pthread_np.h exists on BSD userlands only, so do not enable it on BSD kernels with GNU libc/userland (e.g. GNU/kFreeBSD). Change-Id: Ic9bb2221531322ce425543c85155cfafc5294c41 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Replace Q_STATIC_GLOBAL_OPERATOR with its expansionThiago Macieira2015-01-071-3/+2
| | | | | | | | | | | | | | | | This existed to work around compiler bugs with RVCT. Let's assume anyone still using RVCT is using a newer version. Change-Id: Ic1c1a8b13e0e1d4393c701a6c308df37e80da555 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-172-2/+4
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib2bcdfc23e0e8274e8cc43ed34ec34b1e0cb986d
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-12-171-1/+3
| |\ | | | | | | | | | Change-Id: Ia7239e9362ee936303aaa084cba0fd67c5576c48
| | * Fix aliasing issues when compiler with non g++ makespecsv5.4.05.4.0Simon Hausmann2014-11-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | As it turns out, need -fno-strict-aliasing. It should not only be applied when the mkspec happens to have g++ in its name, we also need it for qnx (qcc) and any other compiler that pretends to be gcc (sets QMAKE_COMPILER to gcc). Change-Id: Id4d152e4fcaa06ecd8acb47a3d8a41997ba82b75 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
View Lorry Controller Status