summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.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-06-291-1/+1
| | | | | | | | Change-Id: I2d9b8deb75e6be1ae91a74726accbfbcccb71a9c
* | 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>
* | 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>
* | 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 "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>
* | | 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>
| * | Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | | | | | Change-Id: I2bc053c14e8b1684cdab81d31ba30b66afd2b97a
| * | Fix clang C++11 buildNobuaki Sukegawa2014-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang with "-std=c++11" does not allow implicit conversion from false to null pointer. Although clang with C++03 and gcc with C++03/11 treat it as warning, not error, the conversion was in fact invalid. Change-Id: I92629f9e313d0a00c4d39ce2e539ed140707ad5c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-271-0/+3
|\ \ \ | |/ / | | | | | | Change-Id: I80f2ea26633997a728eab832fe53ee9f69daf2bc
| * | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-211-0/+3
| |\ \ | | |/ | | | | | | Change-Id: I810e40844951f00e28c74d58c3cd727c455bfaea
| | * Disable jitted Regexp for Mingw 64 bitv5.4.0-rc1Kai Koehne2014-11-111-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | Work around bugs in either the jitted code, or the gcc compiler for Windows that lead to incorrect JavaScript evaluations, most notably in RegExp. This greatly reduces also the number of autotest failures. Task-number: QTBUG-40814 Change-Id: I3045738c8e97b7fc4c12238f1163dd2b844ef877 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-211-5/+3
|\ \ | |/ | | | | Change-Id: I7f4b696e66c95eb915fbb8a9ea5f600f731763df
| * Fix intel cc buildAllan Sandfeld Jensen2014-10-281-5/+3
| | | | | | | | | | | | | | | | | | | | | | The Intel compiler gets confused by the choice between std::signbit() and signbit() so we need to remove the using declaration and make the std namespace explicit to help it a little. Change-Id: I0242de9497723cbb2f497f683b41b41fabef0b4c Task-number: QTBUG-42235 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-201-0/+3
|\ \ | |/ | | | | Change-Id: I96839d57e1ecef10402898abb7d0a3236ff14fba
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-141-0/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/script/script.pro Change-Id: Id2abbacef830a9b553c269af907e12f2c10f8b40
| | * Don't disable C++11 on Mac OS X5.3Morten Johan Sørvig2014-09-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OS X, enabling C++11 has the side effect of switching the standard library from libstdc++ to libc++. Qt 5.2 enables C++11 by default, which leads to a Qt build that uses both standard libraries. This is something we would like to avoid. Change-Id: I0ad8fb550ef79ac37ac97a75799ac38aa19d39d4 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * build with QT_NO_TEXTEDITJoerg Bornemann2014-09-171-0/+3
| | | | | | | | | | | | | | | Change-Id: I0c7ee38cf12de991e23c7259e65f2eaa7c8f7045 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-0924-201/+230
|\ \ \ | |/ / | | | | | | Change-Id: I6999b1c1d74c31615d75adc6126fbf2799a98f51
| * | Fix MinGW build (even more)v5.4.0-beta1Kai Koehne2014-10-012-2/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41673 Change-Id: If58284dc3c02b80abae759924b3e822842e94ee1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| * | Fix MinGW64 buildAllan Sandfeld Jensen2014-09-301-1/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41673 Change-Id: Ic3aa8efefb0425bd68500043e7f44b72cce51313 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * | Fix QNX buildAllan Sandfeld Jensen2014-09-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Copy the MathExtra QNX workarounds from QtWebKit to QtScript. Change-Id: I95fbeeb6669a69e74f4b8a64b148dc5eff8c8e16 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | Fix C++11 build of qtscriptAllan Sandfeld Jensen2014-09-2617-83/+95
| | | | | | | | | | | | | | | | | | Change-Id: I168347f42b61ff00574f7ccf59cd24f044ea64f7 Task-number: QTBUG-41361 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * | Fix DateTime with recent versions of tzdataAllan Sandfeld Jensen2014-09-225-115/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | An backport of http://trac.webkit.org/changeset/150833 needed for correct time KRAT, YAKT and MOS timezones. Change-Id: I3b5369d1427757c0d638865324a36e43dcaa60bf Task-number: QTBUG-41422 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * | Skip constantly failing v8 test on WindowsKalle Viironen2014-09-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | tst_qscriptv8testsuite::smi-negative-zero() fails constantly on Windows 8. QTBUG-41321 Change-Id: I53538f281f725b215fcf6c2f485953341f938946 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
| * | Don't disable C++11 on OS X and iOSMorten Johan Sørvig2014-09-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OS X and iOS, enabling C++11 has the side effect of switching the standard library from libstdc++ to libc++. Qt 5.2 enables C++11 by default, which leads to a Qt build that uses both standard libraries. This is something we would like to avoid. As with clang it is possible to build webkit also with C++11 instead of forcing the use of libc++ also without C++11 we simply build with C++11 on OS X and iOS. Change-Id: I0ad8fb550ef79ac37ac97a75799ac38aa19d39d4 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| * | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-09-180-0/+0
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1d15c7953e54fa7ef5026dc5d21da6d19cdad992
| | | * Bump versionFrederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie3975951a7562ad6a8f91bf73d979bf15e02c8de
| * | | Remove qtdemo from gitignoreRainer Keller2014-09-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QtDemo was removed with a commit in qtdoc. Change-Id: If7dc76ba6a34b4aeb9c224edbaed1bbb3f0923ca Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
View Lorry Controller Status