summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3Liang Qi2017-10-1834-108/+418
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf qtscript.pro Change-Id: If0f8875c8af2afb717ba394fac4e506076f01517
| * Fix outdated BSD license headerKai Koehne2017-10-1731-93/+403
| | | | | | | | | | Change-Id: I191edb211ed6cffce17b0a5b7656691ce41b754c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix outdated FDL license headerKai Koehne2017-10-173-15/+15
| | | | | | | | | | Change-Id: I8e2e863f4a9f05b577f63a233654785a6d294387 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Use qRadiansToDegrees() instead of hand-coding an equivalentEdward Welbourne2017-06-211-8/+4
|/ | | | | | | | The homegrown approximation to pi's value caught my attention. Task-number: QTBUG-58083 Change-Id: I2bf0432f4c71c20131ef48cdd8341cdb9bc098bc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1v5.7.05.7.0Liang Qi2016-05-199-99/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I59a0b27e74c2a4d9d62727e067abcdaf0fb97e8b
| * delete .desktop files of examplesv5.6.1-1v5.6.15.6.1Oswald Buddenhagen2016-04-279-99/+0
| | | | | | | | | | | | | | | | | | they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I55f6786bc2463051e97ca55c81309dd2afbf7580 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | purge symbian vestigesOswald Buddenhagen2016-04-064-14/+1
|/ | | | | Change-Id: I3e66ce25ea21aa846b44b6f99b8afbe0959a6526 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Fixed license headersJani Heikkinen2015-02-1731-93/+93
| | | | | Change-Id: I99e62a707fe649403214436a4b9aad8fd82015ee Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-136-0/+591
|\ | | | | | | Change-Id: Ic32f5bd17782285305aaa01694f1a78851b882eb
| * Doc: Moved the example documentation to correct locationsNico Vertriest2015-01-196-0/+591
| | | | | | | | | | | | | | | | | | | | And fix the \snippet commands to use the correct paths. Also edited dependencies qdocconf files Task-number: QTBUG-43810 Change-Id: I3c2fb6d2a48900a9b5651225381707c9ec25065a Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Update copyright headersJani Heikkinen2015-02-1231-155/+155
|/ | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Iffc10aac2cdaf7c7ceba051ec447f15758c3d8e0 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* qtscript: Check for QtGui before building the examplesVicente Olivert Riera2014-04-171-5/+4
| | | | | | | | | qsdbg and marshal examples need QtGui module. If QtGui is not installed they fail to compile. Change-Id: I1af6a8b39a0848c8208fe94a26ee57409dfd9b41 Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* the qsdbg example needs no QtGuiv5.3.0-alpha1Oswald Buddenhagen2014-02-201-1/+1
| | | | | | Task-number: QTBUG-36893 Change-Id: I4199df78e037c3959fd7d745d89b59d667010b73 Reviewed-by: Simon Hausmann <simon.hausmann@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>
* Doc: Fix module name formatSze Howe Koh2013-01-263-3/+3
| | | | | | | | | | | 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-1031-31/+31
| | | | | | 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-104-5/+5
| | | | | | | 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>
* centralize and fixup example sources install targetsv5.0.0-rc1Joerg Bornemann2012-12-0510-59/+43
| | | | | | | | This follows suit with aeb036e in qtbase. Change-Id: I695c3f7c69cfe811ffe05f7cb381e3216b76e7a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* remove symbian vestigesOswald Buddenhagen2012-12-0410-31/+0
| | | | | Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix scriptdebugger exampleChristian Stenger2012-11-271-1/+2
| | | | | | Task-number: QTBUG-28128 Change-Id: Ifb57fa5e5dc2fa1959e8f04861897f59d3ce635d Reviewed-by: hjk <qthjk@ovi.com>
* Compile fix for example after changes to QApplication constructorAndy Shaw2012-11-242-10/+2
| | | | | | | | As QCoreApplication::Type is no longer public then change this to use QCoreApplication instead as the example does not need a GUI application. Change-Id: I24f98ec6538fc3f4bfc8612defbb6e7bb4dbf9aa Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix build of installed examples.Friedemann Kleint2012-11-211-1/+1
| | | | | | Task-number: QTBUG-27977 Change-Id: I26a85995367d79c0a88f3e8a6e8a4fc15caf9094 Reviewed-by: hjk <qthjk@ovi.com>
* CONFIG+=uitools is deprecated. Use QT+=uitools insteadSergio Ahumada2012-10-312-4/+2
| | | | | Change-Id: I19adcb6365cae2afa9cc994f21891bad8a26690e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2431-186/+186
| | | | | | | | | 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>
* 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-2778-0/+8033
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