summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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>
* | | Blacklist windows 64 bit failures for mingw, tooKai Koehne2014-09-171-0/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-32829 Change-Id: I9e7d9f5b8f5622eaf66fc820566ae94224ba3ae1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Tests: Blacklist Math.sqrt(-0) for MinGWKai Koehne2014-09-171-0/+2
|/ / | | | | | | | | | | | | | | | | MinGW's sqrt(-0.) returns NaN instead of 0.0. Upstream bug https://sourceforge.net/p/mingw-w64/bugs/425/ Change-Id: I0fc16c4e53ea5b4b0f799a4a9cee4052f8b8f293 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Packport FreeBSD defines from Platform.h in qtdeclarativev5.4.0-alpha1Lars Knoll2014-09-021-1/+1
| | | | | | | | | | | | | | | | | | This should get QtScript to compile on some more versions of FreeBSD, including DragonFly. Task-number: QTBUG-35880 Change-Id: Ie40cf8d1cc8a676d51694e609ddc9f85d22b9b81 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-24187-4159/+2486
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I8b229a6405aefe7951ad0d13d6432d01a4ec8263 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-1/+4
|\ \ | |/ | | | | Change-Id: I15ca1dd24c27b5561af6203b542331bb2471379f
| * Work around ICC optimizer bug hoisting conditions out of the loopv5.3.25.3.2Thiago Macieira2014-07-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the first iteration of the loop, span->objects is not null, but becomes null and therefore the entry is removed from the list. When the list is empty, the list header (nonempty_) has next == prev == self and objects is null. So in the second iteration, DLL_IsEmpty should return true. Analysis of the assembly output indicates that the function DLL_IsEmpty (DLL = "doubly linked list") was hoisted out of the loop and its condition was never checked again. Affects: 14.0.3 on Linux, 15 on OS X (EDG and Clang) and Linux Does not affect: 14.0.3 on Windows Intel issue ID: 6000056746 Change-Id: I4439f441d5206a39391b9181baf42160d37bd2f1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Fix warnings when building with gcc 4.8Allan Sandfeld Jensen2014-07-082-0/+40
| | | | | | | | | | | | | | | | | | | | This patch adds some warning flags and feature detection from upstream javascriptcore which gets rid of warnings on COMPILE_ASSERT. My upstream patch: http://trac.webkit.org/changeset/146993 Change-Id: Idd38ef39b6f171a1c90763b2d9d000a4d00374ba Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-072-2/+0
| | | | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I6a09e5862558629338da4bc8332e532d77de7d49 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-261-1/+2
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8d0ef0020712357bbdd3b4ae4d812c72af259dc5
| * Fix crash when creating a QScriptEngine in a native threadAndy Shaw2014-06-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is technicially a cherry-pick of 4e73732d3e72ea59d39ec5a5c01c2e76bbff7dc1 from 4.8. Somehow this change did not end up in Qt 5. The details below is a copy paste from the original change. The change in http://trac.webkit.org/changeset/48412/ introduced a fix to avoid leaking thread specific data by ensuring get() on ThreadSpecific works even during the thread destruction phase. The fix worked by setting the local data again. However as we can see in the backtrace from QTBUG-22926, the local data should not be set unconditionally, otherwise our destroy function will be called recursively when the local data is still set. Task-number: QTBUG-22926 Change-Id: If59d7e92998b9f1da98c05b94e7b6c725ada4a75 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: Ie01204b0cb3a50123c1865a3a4aacb5c12e15c23
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-06-022-5/+6
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia3c3478a804b369b00aabb5739f409bd11dbb982
| * Fix compilation under precompiled headers: define _CRT_RAND_Sv5.3.1stable5.3.1Thiago Macieira2014-06-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the macro _CRT_RAND_S is defined, #include <stdlib.h> will define the rand_s function. All was well before the precompiled headers because wtf/config.h was always the first header included in WTF and it #defined at the right place. With precompiled headers, stdlib.h got included from qglobal.h before the #define took place. This was a latent bug because the non-JSC parts of QtScript could have included RandomNumberSeed.h and caused the error. RandomNumberSeed.h(82) : error C3861: 'rand_s': identifier not found Change-Id: I88b4b8670604b35ca694c02522324ac3083ed2b4 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-241-1/+1
| | | | | | | | | | Change-Id: I52c832fc93ebde96fbc67ca72c709b794fcea9bd Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * qtscript: Check for QtGui before building the examplesVicente Olivert Riera2014-04-171-5/+4
| | | | | | | | | | | | | | | | | | qsdbg and marshal examples need QtGui module. If QtGui is not installed they fail to compile. Change-Id: I1af6a8b39a0848c8208fe94a26ee57409dfd9b41 Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-242-1/+3
|\ \ | |/ | | | | Change-Id: If040ed0b558c5df926a8c7cd1041192f74ac7f4d
| * Fix recursive calling of QScriptProgramv5.3.0-rc1v5.3.0-beta1v5.3.0release5.3.0Lars Knoll2014-03-112-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | The first time a QScriptProgram is evaluated, it gets compiled and then executed. If the execution would somehow trigger another evaluation of the script program, it would run into the compile stage again (even though it already was compiled), and then trigger and assertion in debug mode (or leak memory in release builds). Task-number: QTBUG-37317 Change-Id: I83e7efd5f238d021e200258826e2e4a9520c3a7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-114-14/+19
|\ \ | |/ | | | | Change-Id: I5ce25e65626e497c32e5ecdc7a644ab8f5d3a1eb
| * Fix build on x32Allan Sandfeld Jensen2014-03-041-1/+11
| | | | | | | | | | | | | | | | | | | | Recognize x32 and disable JIT in this configuration. Task-number: QTBUG-35463 Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e Reviewed-by: Gregory Hinton Nietsky <gregory@distrotech.co.za> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Android: fix compileBogDan Vatra2014-03-041-8/+1
| | | | | | | | | | | | | | | | | | In early NDKs (previous to 9) Elf32_auxv_t struct was not defined at all. In NDK 9+ Elf32_auxv_t struct is already defined in elf.h and we'll get an error. We need to include asm/procinfo.h for HWCAP_VFP. Change-Id: I1ba30991ea9dd14ad9d7273c58ed6e61cd75255e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Fix some typosSergio Ahumada2014-03-042-5/+5
| | | | | | | | | | Change-Id: Idb1e503afa74efe167d68e6fb993f50138546c51 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Don't pretend to be PLATFORM(IPHONE) or PLATFORM(IPHONE_SIMULATOR)Tor Arne Vestbø2014-02-271-0/+2
| | | | | | | | | | | | | | As that ends up triggering other code paths such as JIT on ARM. Change-Id: I14238c0913bd60e07de5015a82bcde0ab08a3a19 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-241-1/+1
|\ \ | |/ | | | | Change-Id: I318396444325b8afc3d5fbd1202a463b61fb15fb
| * the qsdbg example needs no QtGuiv5.3.0-alpha1Oswald Buddenhagen2014-02-201-1/+1
| | | | | | | | | | | | Task-number: QTBUG-36893 Change-Id: I4199df78e037c3959fd7d745d89b59d667010b73 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: I87865026484ee72f4d07b6be109cde5f44d0e801 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Replace win32-g++ with mingw scopeKai Koehne2014-02-071-1/+1
| | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: If232fdbaacc9ce6a16c269b4c06b81efa196c2d8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Exclude WinRT from buildMaurice Kalinowski2014-02-051-0/+2
| | | | | | | Change-Id: I36de2011fa78c57e18f5e43b06e2f0ecca1b8f6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2014-02-050-0/+0
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I312f9535c2b4937f0575dec6491f0d73f2726b28
| | * Bump MODULE_VERSION to 5.2.2old/5.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I596c9b720a17a171202d53fdff33445bcb0b46dc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | Mark qscriptjstestsuite as insignificant on Windows.Friedemann Kleint2014-02-051-0/+1
|/ / | | | | | | | | | | | | Task-number: QTBUG-36632 Change-Id: Ida2f4665b25f5343e5abe73b135798ff3546d4d6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Detect AArch64 architectureRiku Voipio2014-01-081-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds WTF platform support for the AArch64 architecture. Patch is based on WebKit-gtk patch done by Riku Voipio, and was cherry-picked and tested by Marcin Juszkiewicz. Task-number: QTBUG-35442 Change-Id: Ie6194f3c430cb6513367a3cdf221a41d60a1ed14 Signed-off-by: Riku Voipio <riku.voipio@iki.fi> Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-051-1/+7
|\ \ | |/ | | | | Change-Id: I6498ca9158162e2c2b9db6867128ba4ae687f5f9
| * JavaScriptCore: c++11 compile fixv5.2.1Tim Blechmann2013-12-051-1/+7
| | | | | | | | | | | | Change-Id: I0de4140323db25765243748dfed8533bca39217c Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-297-12/+24
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie63ca45ad8e2c57ad27c7b693f268ce5c4cc18f4
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-267-12/+24
| |\ | | | | | | | | | Change-Id: I473774c5e7a62c2aa8541d22327366364ad70553
View Lorry Controller Status