summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
* | 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>
* | 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-24146-2773/+1605
| | | | | | | | | | | | | | | | | | - 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* Fix compiler errors.v5.2.0-rc1v5.2.0Erik Verbruggen2013-11-187-12/+24
| | | | | | | | | | | | | | | | | | | | On Mavericks with Apple's Clang 5.0 (3.3 based): ../3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h:320:117: error: non-const reference cannot bind to bit-field 'm_attributesInPrevious' ...add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), existingTransition->m_attributesInPrevious), exi... ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ C++11 specific: ../3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h:179:35: error: non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long') to 'uint32_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] LineInfo info = { instructions().size(), n->lineNo() }; ^~~~~~~~~~~~~~~~~~~~~ Both occur in multiple places. Task-number: QTBUG-34842 Change-Id: I98a29b51718a6e0db8749ac1b495e071e9fe479d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-062-0/+2
| | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I77ed98ade58cdd4c6f5c365682993f1be3f3e958 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* use private linkage where possibleOswald Buddenhagen2013-11-012-2/+2
| | | | | Change-Id: I3c0a1ae83615120f9a0cf8202d4facf915decde2 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix JavaScriptCore ftbfs on mips64(el)YunQiang Su2013-11-011-1/+21
| | | | | | Task-number: QTBUG-33187 Change-Id: Iaebca6f5095e16c0316549c8a548cfc0a447faf3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation of Qt Script with MSVC 2013.Friedemann Kleint2013-10-241-2/+2
| | | | | | | | Starting with MSVC 2013, more functions are provided. Change-Id: Iabbc9a94e7ed01584baaa1bb17c06e41ac70830f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix tab-completion for variables that have digits in themAndy Shaw2013-10-221-1/+1
| | | | | | | | | In the QtScript Debugger if a variable had a number in it then it would not tab complete to show the member variables. This accounts for digits so that it is correctly able to find the variable to complete on. Change-Id: I4fe0b3b776aba0e3caa6dd524c1a0c59421ea515 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* WS fix in qscriptcontext.cppv5.2.0-beta1Jerome Pasion2013-10-081-1/+1
| | | | | | | -produced by git-split-ws Change-Id: I1661678174c62971a7bbf4acb2890fdf590d2f3d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Adding "\inmodule QtScript" to Qt Script classes.Jerome Pasion2013-10-0812-9/+13
| | | | | | | | -reduces QDoc warnings -lists the classes in the C++ pages Change-Id: I97db6b8bec4d44d1ee37ed2925ef7309cd0d420f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Remove QtAlgorithms usage from QtScript.Friedemann Kleint2013-09-266-8/+21
| | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: If4dc8f69fd75315390a4850be732715064f5fdd8 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-0/+2
|\ | | | | | | Change-Id: I8352e99c9886882115b5808e6903ce09645949ba
| * exclude WebKit/JavaScriptCore from lupdate scanOswald Buddenhagen2013-09-021-0/+2
| | | | | | | | | | | | | | | | there is no point in scanning it, and it's incredibly slow. Change-Id: Ife2fe879b8285f18bb714804c532a68ed64f84d8 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | QtScript: Fix header guardTobias Hunger2013-08-291-1/+1
| | | | | | | | | | Change-Id: Ib8db978f3f5414fccfcf772f7fa9b2b7ddbc761c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-022-1/+2
| | | | | | | | | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: I018b00a19c3bbd2aa4bf34712f414569dd50775b Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-112-10/+0
|\ \ | |/ | | | | Change-Id: I4231685b78a7886928efe191aa7f09bb8a50e81e
| * Remove references to obsolete QSA-product.Friedemann Kleint2013-07-112-10/+0
| | | | | | | | | | Change-Id: I2a89644fa7440b0ef113d956affd745716607aee Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Setting navigation variables for Qt Script and Qt Script ToolsJerome Pasion2013-06-262-2/+8
|/ | | | | | | -also enabled linking to 'qtdoc' for the homepage link Change-Id: I74781effabac4c73c8a286347e5aa0821d5931f0 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Bring in WebKit revisions 139553 and 139921.Raphael Kubo da Costa2013-06-111-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are primarily useful for getting rid of some libstdc++-specific includes which break the build with libc++, and also for simplifying the code and removing a Darwin-specific code path. r139553 by ossy@webkit.org: Use sync_add_and_fetch instead of gnu_cxx::exchange_and_add https://bugs.webkit.org/show_bug.cgi?id=106729 After r139514 we need atomicIncrement(int64_t volatile*) for all platform. Now the GCC implementation of atomicIncrement() is based on gnu_cxx::exchange_and_add, which doesn't support int64_t type, but sync_add_and_fetch does. Reviewed by Benjamin Poulain. r139921 by benjamin@webkit.org: Use GCC's implementation of atomicIncrement/Decrement on Mac https://bugs.webkit.org/show_bug.cgi?id=106976 Reviewed by Filip Pizlo. wtf/Atomics.h: GCC and LLVM have builtin for atomic ADD and SUB: sync_add_and_fetch, sync_sub_and_fetch. Using them let the compiler just generate the atomic operations inline instead of generating a function call to LibC. It also simplify the code a bit. Change-Id: Ic85cc1cc436477c63d2ebaf4f9ee2dfe7c05839f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Removed landing page from "technology-apis" group.Jerome Pasion2013-05-241-1/+0
| | | | | | | The group in qtdoc was replaced by the new overviews in qtdoc. Change-Id: I55518f8cf581a4de394863e359a3a848fc9842b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix compilation on ARMv5.1.0-beta1Samuli Piippo2013-05-061-3/+3
| | | | | | | | | | | Android fix broke ARM compilation on non-Android Linux platforms. Now correcly define Elf32_auxv_t only on Android/Qt and otherwise include asm/hwcap.h Task-number: QTBUG-30978 Change-Id: I6708acd876d14b869a93a36f7d969e10febbd38b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Bring in WebKit r74029 to fix the build with clang.Raphael Kubo da Costa2013-04-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | ------------------------------------------------------------------------ r74029 | cwzwarich@webkit.org | 2010-12-14 18:57:14 +0200 (Tue, 14 Dec 2010) | 12 lines Reviewed by Eric Seidel. Clang fails to build the JSC interpreter https://bugs.webkit.org/show_bug.cgi?id=51016 Clang does not allow indirect gotos out of scopes with cleanup. GCC 4.2 allows them, but it does not correctly generate the cleanup, causing a leak if the cleanup decrements a reference count. * interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): Put an Identifier into its own scope. ------------------------------------------------------------------------ Change-Id: Ied16d38431715ef8f1ad9e7d1fae0921500b0ffd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Fix module names in .qdocconfTopi Reinio2013-04-262-22/+22
| | | | | | | | | Use CamelCase for module name(s) used in in .qdocconf - this is required as qdoc will generate visible output (tags in example manifest files) based on these names. Change-Id: If9f79e73d823270d8ecb652d1b7b9d9d44f9562e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix qtscript build for WEC7 by bringing ce-compat back to Qt5 .Janne Anttila2013-04-243-0/+704
| | | | | | | | | | | | | | JSCore build for WEC7 depends on ce-compat, and apparently it was vanished as a part of Qt modularization or some other cleanup. Copied relevant files and pro file lines form Qt4 back to QtScript repo under 3rdparty folder. Change-Id: Ic710be105df17b44962553ae3b61401b2dd6fab5 Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-2/+2
|\ | | | | | | Change-Id: I25b38558ad6515197114831b43a756d4edce6ee9
| * substitute fixed version numbers in qdocconf files with variablesv5.0.2Sergio Ahumada2013-03-261-2/+2
| | | | | | | | | | | | | | Also fix the index title Change-Id: I2bbc581a7095d4d347a4622e2ce16ca7e5e447e5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix compile on AndroidBogDan Vatra2013-04-023-7/+20
| | | | | | | | | | Change-Id: Ide8d4a50169de13e9743f3b2304af2b23c3ce694 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Fix CLANG-warnings.Friedemann Kleint2013-03-082-3/+2
| | | | | | | | | | | | | | | | | | | | - Unused member variable. - Unused static functions. - Return false for pointer. Change-Id: Ie78332d3754e7f53ed75d6006c11d60c29719c7b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Remove deprecation of QScriptContextInfo::columnNumber().Friedemann Kleint2013-03-071-3/+1
| | | | | | | | | | | | | | | | The module is done, there is no need to deprecate functions. Fix deprecation warning occurring in build. Change-Id: I01fb9d91ccc3cb4d6fb4e2134960436f18376e3e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-1/+1
|\ \ | |/ | | | | Change-Id: Idae7dca76362ba04d0d85dec27f9d9bbd7560a9a
View Lorry Controller Status