summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-173-23/+23
| | | | | | | | | | 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>
* Make QScriptValue QObject handling consistent.Stephen Kelly2012-03-061-6/+16
| | | | | | | | | | | 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-064-36/+36
| | | | | | | | | | 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-232-3/+7
| | | | | | | | | Add static plugin test and QtDBusScriptPlugin which were left over (see f1653db0f4b7ceba448a39dc16ba45c0f817ef5b). Change-Id: Ifd1e13882f7e39ce724a6e94732b238255ce3128 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
* Use new plugins system in Qt Script.Friedemann Kleint2012-02-171-2/+3
| | | | | Change-Id: Ie28cc00899abaa3f42a0f43ed199e3c14d45df3e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix compilation on QNX.Sean Harmer2012-02-072-2/+10
| | | | | | | | | Cherry picked commit 144de35b8c770d6698e1e6a11a37cbcc24ca4e8b from Qt 4.8 Change-Id: I6880436b54cc1c8ab6ecb64727316f422dcf5ee8 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Build fix for Windows.Friedemann Kleint2012-02-071-0/+2
| | | | | | | Deactivate min, max macros in windows.h Change-Id: Ie045b6b278fa788d55eb8a3dbefb7fab6edb5934 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30211-213/+213
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I752b02a8155143626d22bd86082177550bd1cfb4 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-23211-279/+279
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6597406c8041227410e672b86a567e1161a0ab59 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove the use of QT_MODULE()Gunnar Sletta2012-01-1914-14/+0
| | | | | Change-Id: Ie234485162d162935e96adec388361b771342c86 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Improve handling of QScriptEngine::ExcludeDeleteLater.Friedemann Kleint2012-01-091-3/+1
| | | | | | | | | Determine index dynamically instead of using a hard-coded index in case should further methods be added. Change-Id: I8a6a3302a0034561e887ad683141a9ac17be45c8 Task-numbers: QTBUG-23502 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix JS to QVariant type conversionKent Hansen2012-01-092-26/+3
| | | | | | | | | | | | | | | | | | 1) The special case for LastType (QVariant) should be done before the general conversion, to avoid calling convertValue() with targetType == -1 (which is useless and causes a qWarning). 2) moc is about to be changed to use QMetaType::QVariant instead of QVariant::LastType to represent the QVariant type. But to keep the CI happy in the transition period we have to check for both. The LastType check will be removed once qtbase has been updated. 3) Get rid of the variantFromValue function in qscriptqobject. It was identical to QScriptEnginePrivate::jscValueToVariant. Change-Id: Ie418facc06c6c7308bc60a3ff66b9a78b109d3d3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-09214-216/+216
| | | | | Change-Id: I323b788326712d95f6213ab8a68c18cfe28b7c76 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix QScriptEngine::ExcludeDeleteLater and metaobject-related autotestsRohan McGovern2012-01-061-1/+4
| | | | | | | | | | | | | | ba635d7e74472f3a54c0c4686966af46d9035c6f in qtbase adds a signal to QObject. This breaks some code in QtScript which hardcoded the list of expected metamethods on QObject, and some other code which hardcoded the index of the deleteLater slot. Fix it. This is a minimal fix which does not address the underlying fragility. Task-number: QTBUG-23502 Change-Id: Id1269f9d8af01e12587ba8ff2fecf942a7231aff Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix compilation due to header changesSergio Ahumada2011-12-171-2/+2
| | | | | | | | | - Fix QtGui => QtWidgets - Fix QtWidgets/qstringlistmodel.h => QtCore/qstringlistmodel.h - Fix QtWidgets/qsortfilterproxymodel.h => QtCore/qsortfilterproxymodel.h Change-Id: I9fb584ae07b5acc79c86e1a62f7118a634e9224e Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QtScript: Fix warnings about set/unused variables.Friedemann Kleint2011-11-103-6/+1
| | | | | Change-Id: Ibee482c27341914fb4ae959e388c3376755b78df Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix warnings about deprecated assignments of QAtomicInt.Friedemann Kleint2011-10-311-2/+0
| | | | | | | | QScriptContextInfoPrivate inherits QSharedData, no need to assign ref. Change-Id: I36ebf64952517b218a3fa9eac5ce1a794988acaa Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QtScript: Remove qpa-sections from .profiles.Friedemann Kleint2011-10-261-5/+1
| | | | | | | Prepare for removal of the -qpa configure option. Change-Id: I44aa205422d1d640962720095a09cf6fb66fa36e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use QBasicAtomicInt load() and store() instead of implicit castingBradley T. Hughes2011-10-101-7/+7
| | | | | | | | | The implicit casts will be unavailable in the near future. Change-Id: I7305bed90fdcd50e910b207dc41caa8d34467c54 Reviewed-on: http://codereview.qt-project.org/6352 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix typo in JavaScriptCore/runtime/Structure.cppKent Hansen2011-10-051-1/+1
| | | | | | | | | Task-number: QTBUG-20482 Change-Id: Ie982ea54f9321afbea37a9986538d905a22eca7b Reviewed-on: http://codereview.qt-project.org/6060 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fixed compile for removal of Qt::escapeRohan McGovern2011-09-301-1/+1
| | | | | | | | | | Broken by source incompatible change in qtbase, b863df7de926448cf0057272c16da04b7cfb11ee Change-Id: I5fc17b3edf934d9aea9bc56dc09e66a2bcd508a7 Reviewed-on: http://codereview.qt-project.org/5820 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Merge branch 'refactor'Gunnar Sletta2011-09-1326-77/+77
|\ | | | | | | Change-Id: I3fc347e94039c644cac2150c09bfb6594e7020ad
| * Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-2914-42/+24
| |\ | | | | | | | | | Change-Id: I4e9fc2e2b8f53a7b20831225093126167030a382
| * | QtScripts: Widget library split.Friedemann Kleint2011-05-2426-77/+77
| | |
* | | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-09-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1299 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 81f0c44f6a4fd4cfa41af5d5b292008185bf3981) Conflicts: demos/gradients/gradients.cpp qmake/generators/makefiledeps.cpp src/corelib/io/qdir.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/widgets/qtabbar.cpp src/qt3support/itemviews/q3listbox.cpp src/qt3support/sql/q3datatable.cpp src/qt3support/text/q3richtext.cpp src/sql/kernel/qsqlresult.cpp src/tools/moc/moc.cpp Change-Id: I9076808dcae1f8392192da1360dd18df68a9f77a Reviewed-on: http://codereview.qt-project.org/4595 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Fix translation context for QML files in a QRC.Michael Brasser2011-07-291-1/+6
| |/ |/| | | | | | | | | | | | | | | Task-number: QTBUG-17255 Change-Id: Id4685f2531af1113947c55184870e3b3cd874c32 Reviewed-on: http://codereview.qt.nokia.com/2355 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | Replace all QAtomicInt ref variables by QSharedData inheritance.Jedrzej Nowacki2011-07-1110-30/+20
| | | | | | | | | | | | | | | | | | | | There is no need to do reference counting by hand. QSharedData class provide good encapsulation of reference counter. Change-Id: I2611a51c2fa6673ccca69fe8ff83741ffac06ee9 Reviewed-on: http://codereview.qt.nokia.com/1378 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Use QAtomicInt instead of QBasicAtomicIntThiago Macieira2011-07-0811-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | None of these classes are POD, so they don't need to use the POD version of QAtomicInt. Change-Id: Ic7b134c85c4b314560ae79250e05159ffde74dfe Merge-request: 1 Reviewed-by: Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1377 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Nierob <jedrzej.nowacki@nokia.com>
* | Use feature profile loading instead of direct inclusion.axis2011-06-073-3/+3
|/
* Update licenseheader text in source files for qtscript Qt moduleJyri Tahtela2011-05-24146-2500/+2500
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Doc: Fixed qdoc warnings.David Boddie2011-05-201-1/+1
|
* Fix crashes with regular expressions QtScript on ARM traditional architecturesSimon Hausmann2011-05-161-0/+6
| | | | | | | | | Save and restore the r8 register properly. Backport of http://trac.webkit.org/changeset/65242 from WebKit trunk Reviewed-by: Jedrzej Nowacki (cherry picked from commit f5acce7e11fa7c6abf5cf5352ec750c1ac65dd29)
* Add QTSCRIPT_VERSION and QTSCRIPTTOOLS_VERSION macros for qtscript moduleLiang Qi2011-05-112-0/+4
| | | | | | | Provide version info for each library. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* Removed some superfluous semicolonsThorbjørn Lindeijer2011-05-101-9/+9
| | | | | Reviewed-by: Kai Koehne (cherry picked from commit 0b877b48dc990ca6bb806be668d60f6ced470de2)
* Use private headersMarius Storm-Olsen2011-05-022-2/+2
|
* Define the QT_NO_.... when the module is absant from QT_CONFIGOlivier Goffart2011-05-021-0/+2
| | | | Task-number: QTMODULARIZATION-38
* Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-022-0/+8
| | | | Output warning if not present
* Make QtScript main project file see dependencies properly and etc.Liang Qi2011-04-271-2/+4
| | | | | This allows for running make -j<n> without breaking. Also add examples to the compile. But two of them were disabled for now because they need QUiLoader.
* Update qtscript by following the new method.Liang Qi2011-04-272-10/+0
|
View Lorry Controller Status