summaryrefslogtreecommitdiff
path: root/examples/script
Commit message (Collapse)AuthorAgeFilesLines
* fix examples/script/qscript for MSVCJoerg Bornemann2012-09-141-1/+1
| | | | | | | | | | The example needs no_batch in CONFIG because examples/script/customclass and examples/script/qscript contain a main.cpp and nmake's inference rules get confused which one to choose. See QTBUG-13496 for details. Change-Id: Ia5b06d985504ff4e72ea5e492a623edce252f57a Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Fixed compile without QtWidgets, unify "is module available?" syntaxRohan McGovern2012-07-301-0/+6
| | | | | | | | | | | If QtWidgets is not available, disable a few examples which need it. Standardize on isEmpty(QT.widgets.name) in preference to contains(QT_CONFIG,no-widgets). Change-Id: I00335149a75911dd4ab42a4ce659889d548a8be3 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* calculator example: increase maximum length of result displayKent Hansen2012-06-281-1/+1
| | | | | | | | | | 15 characters isn't enough to hold results like 1.1760477643322587e-7. Instead it would get chopped down to 1.1760477643322. Task-number: QTBUG-20845 Change-Id: I9ea697ec627caa5225b84208bdf1e6ac0be59ebb Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-251-3/+0
| | | | | | | | | | | | | | | - 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>
* Fixed compile of customclass exampleRohan McGovern2012-02-092-0/+6
| | | | | | | | | | Add a missing forward declaration and include. Add a missing Q_OBJECT (mandatory since qtbase ae85d7c965e7d50404c056a77c73bfe00267fa12) Change-Id: I6a4e73e5eba0d02d02246c8eb9662ec04f037a6c Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3031-31/+31
| | | | | | | | | | 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-2331-31/+31
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6597406c8041227410e672b86a567e1161a0ab59 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0931-31/+31
| | | | | Change-Id: I323b788326712d95f6213ab8a68c18cfe28b7c76 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix compilation due to header changesSergio Ahumada2011-12-171-1/+1
| | | | | | | | | - 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>
* Disabled calculator, qstetrix to resolve impossible circular dependencyRohan McGovern2011-09-201-1/+0
| | | | | | | | | | | | | | These qtscript examples depend on uitools, which is in qttools, which depends on qtscript - a circular dependency. Disable the offending examples for now. Change-Id: Icd684fde329d72fd48eb476dc9f9d0c8440a3a29 Reviewed-on: http://codereview.qt-project.org/5167 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-293-35/+4
|\ | | | | | | Change-Id: I4e9fc2e2b8f53a7b20831225093126167030a382
| * Remove reference to qtdemo.Casper van Donderen2011-07-121-32/+1
| | | | | | | | | | | | | | Change-Id: I1ae89728a405bcab61eaee9192def386e6cd16e6 Reviewed-on: http://codereview.qt.nokia.com/1493 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Fix usage of QT_SOURCE_TREEMarius Storm-Olsen2011-06-072-3/+3
| | | | | | | | Functionality has been moved into qt_example.prf
* | QtScripts: Widget library split.Friedemann Kleint2011-05-2410-11/+15
|/
* Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-209-0/+99
|
* Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-2017-385/+437
| | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* Moved to using a feature profile instead of direct inclusion.axis2011-04-279-9/+9
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2777-0/+8031
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