summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* EXPECT_FAIL tests for MSVC 64 bit in qscriptjstestsuite.old/5.1Friedemann Kleint2013-09-122-1/+15
| | | | | | | | | | Introduce compiler defines for 32/64 bit and adapt the text file. Task-number: QTBUG-32829 Change-Id: I9cdbe5b306264858953e2c710b48300f5690e7db Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* 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>
* test: Fix XPASS for tst_QScriptJsTestSuite::ecma/Math(Math.pow()Sergio Ahumada2013-08-201-2/+0
| | | | | | | | This tests seem to be passing on MinGW 4.8, so removing them from the expect_fail.txt file. Change-Id: I3786d410f1e0937ddc1ceedd8ffd3c07d2619c40 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+25
|\ | | | | | | Change-Id: I025901e52747805c61dc7edd40d5f2d067291bd0
| * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | Change-Id: I256a0624ba33c55bba2a400df42cd8ef66fc7394 Reviewed-by: Wouter Huysentruit <wouter.huysentruit@dzine.be> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-231-1/+1
|/ | | | | Change-Id: I6f3686ed8b527004af33f4ef62bf835220f5a7a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove references to obsolete QSA-product.Friedemann Kleint2013-07-112-10/+0
| | | | | Change-Id: I2a89644fa7440b0ef113d956affd745716607aee Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* test: Add 5.1.0 bic data for linux-gcc-ia32Sergio Ahumada2013-07-082-0/+7161
| | | | | Change-Id: I6d17ba2357350199bb0f0043cc0cc741df6785b4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.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>
* Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| | | | | Change-Id: Ie9a9cd6a4b4f7f4735ff65f47c754b4609e1a1da Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* sync.profile: Point dependencies to an empty stringv5.1.0-rc2v5.1.0-rc1v5.1.0Sergio Ahumada2013-05-251-1/+2
| | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: Id206bb81aa4bd719ac8818b98103238deb05435d Reviewed-by: Iikka Eklund <iikka.eklund@digia.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>
* Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| | | | | Change-Id: I8ec20645dc51247cb669679a233a9d53513e9e37 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.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>
* List QtScriptTools as a module under test.Stephen Kelly2013-04-081-0/+1
| | | | | | | So that the expected version for it is generated. Change-Id: If414029e6cb420b33e5f36baf31ec5ef37c5c491 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-032-2/+27
|\ | | | | | | 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>
| * Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+25
| | | | | | | | | | | | Change-Id: If9bd35e1a66c3a18f2cc826a47177611e1f8b4d3 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix compile on AndroidBogDan Vatra2013-04-023-7/+20
| | | | | | | | | | Change-Id: Ide8d4a50169de13e9743f3b2304af2b23c3ce694 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | Change-Id: I6ee4b5ee37256493ffdff08974ae0c08d7278385 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-1919-70/+9
|\ \ | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: Ie8a79e8c58e45eab13391377dd33750ff2d98c08
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-0/+2
| |\ \ | | | | | | | | | | | | Change-Id: I30d4ed2bdc73988b29788ade5f2ccfd3c1cc0eba
| * | | Fix CLANG-warnings.Friedemann Kleint2013-03-083-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-03-083-3/+3
| |\ \ \ | | | | | | | | | | | | | | | refs/staging/dev
| | * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-063-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ia4787958ecb8c924cca00b149e908587e9a2b2f1
| * | | | | 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-187-11/+1661
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Idae7dca76362ba04d0d85dec27f9d9bbd7560a9a
| * \ \ \ \ Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-0736-134/+371
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | refs/staging/dev
| | * \ \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-0536-134/+371
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib100dac4eccddf7a72382b7d1ead7d504a572347
| * | | | | | | Fix compile error caused by min/max defines.Friedemann Kleint2013-02-051-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtbase d0804ff2dd3d289a0f0c58aa30c4334e66ea9be0 introduces a check for min/max which causes a compile error. Change-Id: I6a79e75423baa3f577eb26697e2766e58040b7d9 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * | | | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2815-60/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: I7fed9ff47fd84f6cf2b418658a1ee3e7130539ac Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | | | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17339-102775/+7386
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b5356983f0b86a4c5e339ebb1eae2c20e825b70
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-0441-237/+150
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: I5479b6eacc5366304d3d65c5287d9170b21a3c6c
| * | | | | | | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should test dev branches against dev branches only by default. At some point we should automate the merges from release->stable->dev and/or decide how to handle possible conflicts. This is good enough for the time being. Change-Id: I70b0244db87bd4a7023004bf50629bb790d6dfc2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | | | | | | Test the cmake scripttools module only if widgets is available.Stephen Kelly2013-03-141-2/+11
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia124db1328e9d6b87c9b1b6858103f81e1678355 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | | | | | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | Change-Id: Ic66e2b3a22797132c61a155f8574695416e1203b
| * | | | | | define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I3b751565b50c12c5bcd2fab293e8fc9092b1c10b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | | | | Merge branch 'stable' into releaseOswald Buddenhagen2013-02-20350-102884/+9145
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | Change-Id: I7178c6375a3c2a555d9eb88922082d3af22a3f20
* | | | | | | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: I778e3ca6a5f3f316948c652f4f30f00ebbf900cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | | | | Fix a typo in QScript example.Jędrzej Nowacki2013-02-261-1/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LoadScript function should iterate over arguments and load all scripts not only the first one. Task-number: QTBUG-28805 Change-Id: I03c6764946cfb403ff5af818bfc45b41524ad5c6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | | | | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-154-0/+1660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: I85480f9336a975e77866a95c12801259f5ee83a9 Reviewed-by: Jason McDonald <macadder1@gmail.com>
* | | | | | Remove QPointerBase bic check.Stephen Kelly2013-02-132-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: I84f8708a06f4c4495a073b3bde02015b263403cf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | | | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Change-Id: I9091efd330ce903d2f78d7ecf0ca718a001a00df Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | | Merge branch 'release' into stableSergio Ahumada2013-01-3115-26/+263
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: If3a1efe3888b872702d75e25d1943ff79d57e9c6
| * | | | Fix QtScript crash on 64bit with JIT.v5.0.1Friedemann Kleint2013-01-282-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During back-trace generation we calculate a code offset towards JIT generated code. Using JITCode::offsetOf() will crash/assert if the offset doesn't fit into 32 bits, because the generated code can only encode relative offsets in 32-bits and not 64-bits. However in this context - backtrace generation - we just want to calculate the offset and are not interested in this architectural limitation, therefore we can just calculate the offset ourselves using the fully sized uintptr_t. Initial-patch-by: Simon.Hausmann@digia.com Task-number: QTCREATORBUG-8629 Task-number: QTBUG-23463 Change-Id: I0efadd5ed20855409122e1fcc9236fdfbc4f62a4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * | | | Doc: Modularized Qt Script Tools documentation.Jerome Pasion2013-01-2413-16/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -moved content from qtdoc -moved snippets to src/scripttools -enabled 'make docs' -edited QScriptEngineDebugger with the proper module identifier -created two way links from Qt Script to Qt Script Tools Change-Id: I83a76278969528dcb1ecbca4acc8563fe9390978 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * | | | Update changes file for 5.0.1 releaseSergio Ahumada2013-01-211-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I575ab7319e3ef9d19da9b83aef15bf8e5f50dbd5 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
View Lorry Controller Status