summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* don't reference $$QT_SOURCE/BUILD_TREE - they're unavailable hereOswald Buddenhagen2012-06-064-5/+5
| | | | | Change-Id: I88316acb4cfc867689dfa636dd7554ac0976275f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Modularize QtScript documentation.Casper van Donderen2012-06-0532-144/+408
| | | | | Change-Id: I042d9bafe4f48a8cd23306f0864b6872776d0153 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Disable C++11 support when building QtScriptBradley T. Hughes2012-06-041-0/+1
| | | | | | | | As the existing comment shows, the WebKit code cannot be built with C++11 support enabled. Change-Id: Ic900fb1dc73420fcc3fcec9e7d574f7dece0e036 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix crash when converting invalid JSValue to stringKent Hansen2012-06-012-0/+11
| | | | | | | | JSC::JSValue::toString() expects that the input is valid. Task-number: QTBUG-21896 Change-Id: I3199fcba94be5426cb3d193b57d16176daae83a0 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix crash when accessing QObject properties through activation objectKent Hansen2012-06-013-0/+23
| | | | | | | | | | | | | | | | Since objects in the scope chain have to be JSActivationObjects, QScriptContext::setActivationObject() creates a proxy object that should delegate access to the actual object. This case was not handled in the toQObject() conversion function, so for activation property access through evaluation (where the this-object would be the proxy object, not the actual QObject), the this-object conversion to QObject would fail, and the assert "this-object must be a QObject" was triggered. Task-number: QTBUG-21760 Change-Id: I40e868d9717ec76e0df18d5848c6ad99546ba34f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix scripttools compilation when some features are disabledKent Hansen2012-06-015-0/+50
| | | | | | | Task-number: QTBUG-20378 Change-Id: Ia1dc574824cb1d58c237d60675d1b8a5f8f44c43 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Don't crash in debugger if QScriptEngine is deletedKent Hansen2012-06-013-1/+21
| | | | | | | Task-number: QTBUG-21548 Change-Id: I925a920c8685cf4cf40c7ad03c2d519e2f2121fb Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Remove trailing semi-colonKent Hansen2012-05-311-1/+1
| | | | | | | Task-number: QTBUG-22152 Change-Id: Iad9f14ea4bbe401091aa5c56f8ce7abf0e69af8b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Add missing staticMetaObject member initializationKent Hansen2012-05-291-1/+1
| | | | | Change-Id: Ia10e82a896eb40a7af8045cb120e3fc4afd88a02 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix race condition in tst_qsharedmemory autotestKent Hansen2012-05-281-1/+2
| | | | | | | Task-number: QTBUG-25655 Change-Id: I9d0c1498decfe94a84b3ddaba566eac92066e14d Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Deprecate the Encoding argument of qsTranslateLars Knoll2012-05-213-32/+28
| | | | | | | | | | This is the same as change 4822a821facbbf834c6aab5a8a7da2b3e43f09f7 in qtdeclarative. We always assume the js source code is Utf8 encoded, as also on the C++ side. Change-Id: I4f49484241718dfc4a2bb39a674b54df46aa8c8d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Simplify QVariant::convert and QVariant::canConvert calls.Jędrzej Nowacki2012-05-212-4/+4
| | | | | | | QVariant::Type casts are not necessary in Qt5. Change-Id: I43833e869379db8937839612dfb6162f878870cb Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* qMalloc, qFree and qRealloc are deprecated.Debao Zhang2012-05-203-10/+10
| | | | | | | | Use the stdlib version directly instead Change-Id: Ib289b37c9a00b7da1926e20cc1c1b5a52388fb2f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Update the includes after QIcon was moved back to QtGuiOlivier Goffart2012-05-203-3/+3
| | | | | Change-Id: I203a7c48f2280b22a8b224a82a07c29ffbae3c78 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Skip tst_QScriptEngine::collectGarbageOlivier Goffart2012-05-201-0/+1
| | | | | | | | | | | | This test is blocking CI. It is possible that depending on the optimisation flags, some pointers are still on the stack. This feature is also tested in tst_QScriptEngine::collectGarbageAfterConnect Change-Id: I264f634aa58a002738b8d9c87c43ee1790bb329a Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove the test generator for the test qscriptvaluegenerated.Friedemann Kleint2012-05-1611-1401/+0
| | | | | | | | | | The data will not be re-generated any more since the module is done. See also 58f53b807fafcadf76282f0c8c7f20451c7a97a5. Change-Id: Ida365dbb2e0a70b1cf7d5f0714e5df4cc7084d30 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fixed MSVC2011 buildAndreas Holzammer2012-05-165-10/+10
| | | | | | | | | | | | JavaScriptCore fix is relevant to changed ctor of the std::pair in C++11. Due to that change some code has been broken. Fix makes using std::pair compliant to both standards Change-Id: I77a1fe4b137480b51c24267b7aacb5b688dbddb3 (Partially cherry picked from commit 9a06d491e8e63293e4cc877b00f3a59188283785) Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Kervala <kervala@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Doc: Fix \sa usageMarius Storm-Olsen2012-05-101-1/+1
| | | | | | | | Ensure comma between elements (1 missing), single space and curly- braces around title elements, etc. Change-Id: I0c8e0f0a8ca2cd942fa69424440eeec3ae88af27 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Revert "JSCore build fix for WEC7"Andreas Holzammer2012-05-101-11/+0
| | | | | | | | | | | | | | | It's reverted, as there seems to be at least two implementations of the stl in WEC7. One for each BSP SDK and one shipped with the compiler, which is in this case Visual Studio 2008. The Compiler has a stl with std::min etc. Visual Studio GUI also uses the compiler version of the stl first. It seems to be that the environment was setup wrongly. Checksdk also uses the right order. This reverts commit 8b65d84145f0f415d0963caa7b49da07ac67148d. Change-Id: Ic00d87777e822d9a7c2ee16ce60cad3782293245 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove large, static QString[] arrays from test qscriptvaluegenerated.Friedemann Kleint2012-05-105-263/+173
| | | | | | | | | | | | They seems to trigger a compiler error for linux-arm-gnueabi-g++ (32bit). Use const char *-arrays and introduce utility functions to populate the static hashes, sets. Fix some string and iterator usage errors. Change-Id: I4e32c6ffa004e141bc04c3a2971c379f71072b38 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-034-18/+18
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I4f44512856ea99112d8eb6d341d6058c1fc439dc Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Port qtscript to QMetaMethod-based connectNotify()Kent Hansen2012-05-012-55/+45
| | | | | | | | | | | | | | The const char *-based API is deprecated and will be removed in Qt5. Also improve the autotest so we check precisely the number of connect/disconnect notifications received. The hacks to manually call the notify functions aren't needed anymore, because the internal QMetaObject::(dis)connect() now does it for us. Change-Id: I2e5efed34ee1cba0aad8e60ea00dc9bc2a25bc6c Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix some deprecation warnings in QtScript.Friedemann Kleint2012-04-306-14/+24
| | | | | Change-Id: I98d4826fcc2e3687d45edfccca956891ca0466cf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed compile for removal of const from QRegExp::indexInRohan McGovern2012-04-301-1/+1
| | | | | | Task-number: QTBUG-25064 Change-Id: I8adfe68a610a37b667803939553739d64a714c51 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove insignification from qscriptjstestsuite test.Jason McDonald2012-04-261-2/+0
| | | | | | | | | | This test has not failed on Windows since CI testing on that platform began. Task-number: QTBUG-24426 Change-Id: I0cafb1bcf94fbd96d81bb4075e045ff434f58d28 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignification from qscriptv8testsuite test.Jason McDonald2012-04-261-2/+0
| | | | | | | | | | This test has not failed on Windows since CI testing on that platform began. Task-number: QTBUG-24427 Change-Id: I955eeb23b954d46b3b9170cd58fdc77493ab3476 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Addapt QtScript to the new moc outputOlivier Goffart2012-04-251-5/+1
| | | | | | | | | As changed by change If0b8f586cbaf633eed10045adee3ba3366826c86 in qtbase. Change-Id: If6556f75451c6a2c7e78b7987dc713d1b9b30179 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Don't use the QRegExp methods that modify the objectThiago Macieira2012-04-241-2/+4
| | | | | | | | | | | | | | QRegExp matching methods modify the object, which we don't want to. In particular, when we receive a QRegExp from the user or we store in a context that might require thread-safety, make sure we make a copy before using it. QRegularExpression has no such shortcoming. Task-number: QTBUG-25064 Change-Id: I4f57d8df2e4de13aa95bb72da53c2565b38ae616 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* JSCore build fix for WEC7Janne Anttila2012-04-191-0/+11
| | | | | | | | | | | WEC7 does not have std::ptrdiff_t type and std::min/std::max, introduced the missing types and functions in JSCore platform.h Task-number: QTBUG-22497 Change-Id: I0bf2bff2a80bdff36253f233b30cc95e1c772e23 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> (cherry picked from commit 7f8612853273f9dc120a7bc096f10821eb48fd2b)
* WEC7 build fix - use ptrdiff_t from std namespace.Janne Anttila2012-04-191-1/+1
| | | | | | | | | | | | WEC7 does not have ptrdiff_t outside std namespace, switched to use ptrdiff_t from std namespace correspondingly as OwnArrayPtr.h does in operator[]. Task-number: QTBUG-22502 Change-Id: I5c2ffd271cccd12c1fcdca3975ace3e8224e00bf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> (cherry picked from commit 9912af2108398b8633f91300c455455f6e16e482)
* Fixes to JSCore for WinCE.Janne Anttila2012-04-191-9/+9
| | | | | | | | | | | | Moved WINCE specific code before desktop windows code. This is needed because in WinCE both OS(WINCE) and OS(WINDOWS) are true. Task-number: QTBUG-22502 Change-Id: Icf9ad1a155dc705e37e5e057bb23bc7f5c2d4931 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> (cherry picked from commit e93c5aae8366d430d69827d409f3b6d31eb5dfb6) Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
* Update implementation of callQtMethod after QMetaType::UnknownType introductionJędrzej Nowacki2012-04-171-8/+10
| | | | | | | | This patch gets rid of qWarning caused by misuse of QVariant. Change-Id: I889bd3830d86ea6d69db7a7ddb160a1f4da0c9bd Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add missing case in QScriptEnginePrivate::createJędrzej Nowacki2012-04-171-0/+1
| | | | | | | | | Currently QMetaType::UnknownType, instead of QMetaType::Void, is used to check if a type id is valid or not. Change-Id: Ib185e3f28ef675c57d9b8b0d2eb4e4f124999131 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Update QObjectConnectionManager to meta-object revision 7Kent Hansen2012-04-171-10/+28
| | | | | | | Regenerate the moc output so that it's in sync with the latest moc. Change-Id: I61790556eda2f5e0fc6f9a21c32e068bcb912c56 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Adapt qtscript to QMetaMethod::signature() renamingKent Hansen2012-04-174-25/+25
| | | | | | | | | | QMetaMethod::methodSignature() should be used instead, and it returns a QByteArray. Change-Id: I81150e238dab7eda26d0466ac407a4f3ba79a7c7 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix the build with gcc 4.7.Andras Becsi2012-04-122-5/+2
| | | | | | | The dependent base class of nested classes has to be fully qualified. Change-Id: If166ad3578fd65ea84899da65d2b85283dbcca9d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* List only the QtCore module in the QScriptTools depends.qt-v5.0.0-alpha1Stephen Kelly2012-03-221-1/+1
| | | | | | | The others do not appear in its public interface. Change-Id: I70f676123f235b8859f4cec91c4902b441f506c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Disable qtscriptengineagent autotest for non-developer buildsKai Koehne2012-03-151-1/+1
| | | | | | | | It uses qt_script_isJITEnabled , which is only exported with -developer-build. Change-Id: I1c3d69c82896b8b940b5913629b68227a66f9815 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Make QScriptValue QObject handling consistent.Stephen Kelly2012-03-062-7/+18
| | | | | | | | | | | The behaviour has been inconsistent since ae85d7c965e7d50404c056a77c73bfe00267fa12 in qtbase which added special handling of QObjects to QVariant. Change-Id: Ie75faa3cc3387cff8894cdba025c93f2cc2ea491 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix compilation, use DefaultCodec.Friedemann Kleint2012-03-061-1/+1
| | | | | Change-Id: I0d1036eb75de9fcd2663ec5476d3b13edb2e264e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-069-350/+350
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I7733d18ce1e3459ef618802060d176c9211d3d5f Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Remove use of QT_ASCII_CAST_WARN_CONSTRUCTOR.Stephen Kelly2012-02-231-2/+2
| | | | | | | Fixes build after I0b4df4c99600cacbaafbf0bc4270cd4978600956 Change-Id: If85e4ee8c2fd43baa24cf8608ad2f81ea112ae7c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Use new plugin system in QtScript.Friedemann Kleint2012-02-236-5/+16
| | | | | | | | | Add static plugin test and QtDBusScriptPlugin which were left over (see f1653db0f4b7ceba448a39dc16ba45c0f817ef5b). Change-Id: Ifd1e13882f7e39ce724a6e94732b238255ce3128 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Windows: Mark two failing QtScript tests insignificantMiikka Heikkinen2012-02-232-1/+3
| | | | | | | | | Once underlying issues are fixed, the tests need to be re-enabled. Task-number: QTBUG-24203 Change-Id: I38449fd3753f647abaaab24f8928d28fd921cdcb Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Port QtScript autotests to QMetaObjectBuilderKent Hansen2012-02-224-113/+49
| | | | | | | | | The tests were using a custom meta-object builder that generated meta-objects of an old revision. Kill the custom builder and use QMOB instead. Change-Id: I4eeb6f08474f780dead13fc1a9e3605b93973672 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Update QObjectConnectionManager meta-object to revision 6Kent Hansen2012-02-221-11/+28
| | | | | | | | | | Support for old meta-object revisions will be removed in Qt 5. This commit brings the QObjectConnectionManager meta-object in sync with current moc output. Change-Id: Iaee8bf68cc9d0568092f7692b3422145fed91c93 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fix link for QObject integration documentation in QScriptEngineTeemu Katajisto2012-02-211-1/+1
| | | | | | | | | Picked from 4.8 commit 3826203f744a2147bebf5f088de0d524156f59fd Task-number: QTBUG-8323 Change-Id: I360f7592cb6a0906ab7bf402963109b7aa1edebe Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Remove solaris-g++ SPARC workaroundBradley T. Hughes2012-02-211-5/+0
| | | | | | | | It is unclear when or why this was added. We will re-add this in the future if testing reveals the need. Change-Id: I3a0cabe5489dc0f6602c8d771978c90887cff69e Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Compile windowsJan-Arve Saether2012-02-201-0/+3
| | | | | | Change-Id: I5adabccb85738f16a13f725ade7fa0e17d565b1e Reviewed-by: Jo Asplin <jo.asplin@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Use new plugins system in Qt Script.Friedemann Kleint2012-02-174-7/+12
| | | | | Change-Id: Ie28cc00899abaa3f42a0f43ed199e3c14d45df3e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
View Lorry Controller Status