summaryrefslogtreecommitdiff
path: root/src/scripttools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge branch 'release' into stableSergio Ahumada2013-01-319-7/+403
|\ | | | | | | Change-Id: If3a1efe3888b872702d75e25d1943ff79d57e9c6
| * Doc: Modularized Qt Script Tools documentation.Jerome Pasion2013-01-249-7/+403
| | | | | | | | | | | | | | | | | | | | | | | | -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>
* | Doc: Fix module name formatSze Howe Koh2013-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtScript -> Qt Script QtScriptTools -> Qt Script Tools Change-Id: Icf6b2ea3829247475f8902334b615f9a9206cc51 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Update copyright year in Digia's license headersSergio Ahumada2013-01-10142-142/+142
| | | | | | | | | | | | Change-Id: Ic4a2739c8caf2eac95e4a72d8d38cfb912d5fe2b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | make use of qtHaveModule()Oswald Buddenhagen2013-01-101-1/+1
|/ | | | | | | Change-Id: I440b609d23570293f21f21a2cb31854366d06bf7 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove symbian vestigesOswald Buddenhagen2012-12-041-2/+0
| | | | | Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Always get the default flags from QAIM.Stephen Kelly2012-11-272-2/+2
| | | | | Change-Id: I9171bce02bc1cd0973fee43af1774f887b4f8668 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24142-3408/+3408
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id0b72b8c895b0eab04a740bf83859c9b646dd911 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: I1d95fe8089d8384563654630b9f4b201245887b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make use of QT_PRIVATE to specify private Qt dependenciesOswald Buddenhagen2012-08-111-3/+1
| | | | | Change-Id: I05b18befb71ef0483ee5a40dab6163f0612782e0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: Ied05f26ee735d63a89a5bcf9b7afbeaa8e70809c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add qtscriptglobal.h for the qtscript.git module EXPORT macrosThiago Macieira2012-08-091-0/+1
| | | | | | | | No library other than the core libraries should depend on their export macros being in qglobal.h. Change-Id: I6ded70813f6296ca5aa1d7d3cdb38503a5538424 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-251-9/+1
| | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - qmake -project boilerplate Change-Id: I618bc1db930a372e7f713f21f21b2cfedc839258 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-251-2/+4
| | | | | Change-Id: I060145658caaa4b4d39c323c6004e594ff44f98f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Doc: Modularize QtScript documentation.Casper van Donderen2012-06-051-5/+5
| | | | | Change-Id: I042d9bafe4f48a8cd23306f0864b6872776d0153 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix scripttools compilation when some features are disabledKent Hansen2012-06-014-0/+44
| | | | | | | 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-012-1/+3
| | | | | | | Task-number: QTBUG-21548 Change-Id: I925a920c8685cf4cf40c7ad03c2d519e2f2121fb Reviewed-by: Kent Hansen <kent.hansen@nokia.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>
* 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>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-031-1/+1
| | | | | | | | | | 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>
* Fix some deprecation warnings in QtScript.Friedemann Kleint2012-04-301-4/+4
| | | | | Change-Id: I98d4826fcc2e3687d45edfccca956891ca0466cf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-061-1/+1
| | | | | | | | | | 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 "All rights reserved" line from license headers.Jason McDonald2012-01-30142-142/+142
| | | | | | | | | | 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-23142-142/+142
| | | | | | | 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-191-1/+0
| | | | | Change-Id: Ie234485162d162935e96adec388361b771342c86 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-09142-142/+142
| | | | | Change-Id: I323b788326712d95f6213ab8a68c18cfe28b7c76 Reviewed-by: Rohan McGovern <rohan.mcgovern@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-101-3/+1
| | | | | Change-Id: Ibee482c27341914fb4ae959e388c3376755b78df 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-296-23/+11
| |\ | | | | | | | | | 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>
* | Replace all QAtomicInt ref variables by QSharedData inheritance.Jedrzej Nowacki2011-07-115-17/+10
| | | | | | | | | | | | | | | | | | | | 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-085-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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-071-1/+1
|/
* Update licenseheader text in source files for qtscript Qt moduleJyri Tahtela2011-05-24142-2414/+2414
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Add QTSCRIPT_VERSION and QTSCRIPTTOOLS_VERSION macros for qtscript moduleLiang Qi2011-05-111-0/+2
| | | | | | | Provide version info for each library. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* Use private headersMarius Storm-Olsen2011-05-021-1/+1
|
* 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-021-0/+4
| | | | Output warning if not present
* Update qtscript by following the new method.Liang Qi2011-04-271-6/+0
|
* First attempt to build scripttools.Liang Qi2011-04-271-2/+9
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-27199-0/+28257
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
View Lorry Controller Status