summaryrefslogtreecommitdiffstats
path: root/demos/qtdemo
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-3143-553/+553
| | | | | | | | | 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: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Bump year to 2015Kai Koehne2015-01-151-1/+1
| | | | | | | Bump year to 2015 in all but source code comments. Change-Id: I1dd7972dee65a86a9bd560ead32bbd0cbe82f439 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Updated year in copyright headerKai Koehne2014-03-2643-43/+43
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1343-43/+43
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2943-1015/+1015
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0142-84/+84
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. 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: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* QtDemo: Find installed examples on Windows.Friedemann Kleint2012-07-261-10/+22
| | | | | | | | | | | Add the '.exe' suffix before checking for the existence of the file in the example folder and the 'Debug'/'Release' subfolders. Clean up the code. Task-number: QTBUG-26531 Change-Id: Idd4927558573fe68bf12f98863d0c8848257d3e2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Change bugreports.qt.nokia.com -> bugreports.qt-project.orgSergio Ahumada2012-02-091-1/+1
| | | | | | Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1143-43/+43
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix QtDemo declarative examplesAlan Alpert2011-12-021-9/+9
| | | | | | | | The attempt to turn them into C++ examples messed them up as QML examples. Have QtDemo treat them as C++ examples for now. Task-Number: QTBUG-22983 Reviewed-By: Chris Adams
* Fix permission (no execute bit).Frederik Gladhorn2011-11-221-0/+0
|
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2442-719/+719
|\ | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1342-719/+719
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * Doc: QtDemo now gives error message when example doc cannot be loadedGeir Vattekar2011-03-071-2/+4
| | | | | | | | | | Task-number: QTBUG-16004 Reviewed-by: Richard Moe Gustavsen
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-03-251-2/+4
|\ \
| * | Doc: QtDemo now gives error message when example doc cannot be loadedGeir Vattekar2011-03-141-2/+4
| |/ | | | | | | | | | | Task-number: QTBUG-16004 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 07ce2c31c3e020ad7c5ea4d7cc94296b6860adac)
* / Doc: Added QtWebKit examples from Qt Quarterly 26 and 32.David Boddie2011-03-101-1/+3
|/
* Update copyright year to 2011.Jason McDonald2011-01-1143-43/+43
| | | | Reviewed-by: Trust Me
* Remove Snake demo from QtDemoAlan Alpert2010-11-051-1/+0
| | | | | | Snake now uses the runtime property, which we don't have in QtDemo. Task-number: QTBUG-15048
* Fixed many spelling errors.Rohan McGovern2010-10-255-5/+5
|
* Fix minehunt execution from QtDemoJoona Petrell2010-10-062-1/+2
| | | | | Task-number: QTBUG-14250 Reviewed-by: Martin Jones
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291-1/+1
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Remove extra stringsAlan Alpert2010-09-021-3/+1
|
* Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-203-2/+10
| | | | Also changes the line documenting the quit signal on QDeclarativeEngine.
* Add a quit button to declarative examples in QtDemoAlan Alpert2010-08-201-33/+25
|
* Without Declarative, still build and run QtDemoAlan Alpert2010-08-194-13/+33
| | | | | | | If declarative is configured out then QtDemo will now still build, with all declarative demos disabled. Task-number: QTBUG-12983
* Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-1/+1
| | | | | Reviewer: David Boddie Task number: QTBUG-11938
* Fix the remote command delimiter, this has cahnged at some point.kh12010-08-041-1/+1
| | | | | Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck
* Modified qtdemo so error does not appear when there is no demo/example ↵Kevin Wright2010-08-021-2/+2
| | | | description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
* Remove the -use-blur option from qtdemoAlan Alpert2010-07-195-56/+1
| | | | | | It relied on the now missing pixmap property. Since it isn't used, it doesn't seem worth the effort to update it to use a declarative image provider instead.
* Add label to explain how to exit QML demosAlan Alpert2010-07-191-5/+33
| | | | | | | Some people didn't figure it out intuitively, so extra help is now provided. Task-number: QTBUG-11868
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-011-4/+11
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket::systemCaCertificates(): have one common case for all Unices Fixed QX11EmbedContainer. Improved a bit detection of a touch screen on Windows. qdoc: Fixed invalid format in the html header. link glu32 before opengl32 Stopped trying to output QML property list in 2 columns
| * qdoc: Fixed invalid format in the html header.Martin Smith2010-07-011-4/+11
| | | | | | | | Task-number: QTBUG-11803
* | Tweak Qt Demo BehaviourAlan Alpert2010-06-251-0/+1
| | | | | | | | Don't close on right click inside the demo.
* | Stop other mouse buttons propagatingAlan Alpert2010-06-241-0/+1
| |
* | Expand on warning messageAlan Alpert2010-06-241-1/+1
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-241-1/+1
|\|
| * There where still references to the old Assistant.kh12010-06-231-1/+1
| | | | | | | | Task-number: QTBUG-11651
* | Check for main.qml firstAlan Alpert2010-06-221-3/+3
|/ | | | | | | On case insensitive platforms, it would accidently pick up internal components sometimes if you check the other way around. Task-number: QTBUG-11566
* Avoid printing a warningAlan Alpert2010-06-211-1/+2
|
* Only steal hover events when enabled, in QtDemo's qml integrationAlan Alpert2010-06-211-1/+1
| | | | | | | | Not sure whether it was the correct behaviour for a MouseArea to have when enabled is false but hoverEnabled is true, that it would still get hover events. But the current behaviour is unambigious and correct. Task-number: QTBUG-11564
* Allow things that load SameGame to disable the Quit buttonAlan Alpert2010-06-211-0/+1
| | | | | | | If I missed any, just set inAnotherDemo to true on the SameGame root item. Task-number: QTBUG-11562
* Seems to fix the keyboard focus confusionAlan Alpert2010-06-211-2/+5
| | | | Task-number: QTBUG-11411
* Some tweaks on the QML-enhanced QtDemoAlan Alpert2010-05-303-10/+17
| | | | | | -don't crash if we aren't showing the FPS -different method of unloading the QML example when hidden -fix screwed up background when scaled.
* Tweak aesthetics of QML viewer inside QtDemoAlan Alpert2010-05-278-175/+118
| | | | | Make the UX more controlled from QML, and tweak the frame to be better. Blur mechanism has been reworked, but still disabled by default.
* License header.Warwick Allison2010-05-252-0/+82
|
* Integrate some QML examples and demos into qtdemoAlan Alpert2010-05-2411-29/+316
| | | | | | | | | | | | | Includes minor changes and additions to the existing doc and examples, so that they follow Qt conventions better. Note that while blurring the background was part of the plan for the embedded QML viewer I could not get it to perform well enough. In the future, when blur is fast enough (or someone else can get it to perform better than I) -use-blur should become the default, and -no-blur the option. Task-number: QTBUG-10582
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * Add spectrum analyzer demo appGareth Stockwell2010-05-051-0/+1
| | | | | | | | | | | | | | | | | | This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis. Reviewed-by: Alessandro Portale
* | Remove the OBJECTS_DIR variable assignment from some projets in Qt.Jocelyn Turcotte2010-03-041-2/+0
|/ | | | | | | This prevent debug and release object file to be mixed up when linking these application in a debug_and_release configured Qt. Reviewed-by: Marius Storm-Olsen