summaryrefslogtreecommitdiff
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-31470-4975/+4975
| | | | | | | | | 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-152-2/+2
| | | | | | | 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-26465-465/+465
| | | | | | | | | | | | | | | | | | 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-13465-465/+465
| | | | | | 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-29469-8979/+8979
| | | | | | | | 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-01462-922/+922
| | | | | | | | | | | | | - 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-092-2/+2
| | | | | | Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Symbian: fix qml file paths in building of demosPasi Pentikainen2012-01-258-9/+22
| | | | | | | | | The location of included QML files in demos had changed at some point, but the symbian specific QML deployment parts were not updated to reflect the new locations, thus breaking compilation. Change-Id: Id01a685ca1de75cf73d32170b9f404c6619da7f5 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Remove copyright messages from .pro files.Jason McDonald2012-01-116-17/+0
| | | | | | | | Qt Project files (.pro) are not subject to copyright, and therefore should not contain a copyright notice. Change-Id: I4e3f707a4a2ccc23b0d5c6b312023aa5dcdeb5d5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | Manually update strings that did not get fixed by previous search-and-replace. Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11464-464/+464
| | | | | | | | | 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>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-12-071-2/+0
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fix declarative examples and demos issue on Windows
| * Fix declarative examples and demos issue on WindowsDaniel Molkentin2011-12-061-2/+0
| | | | | | | | | | | | | | | | On Windows, if the resulting binaries reside in /Delease and /Debug subdirs. Thus we require the same hack as on Meego where the binary alone resides in the /bin subdir. Reviewed-by: Alessandro Portale
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Correct client rect calculation for MCL Symbian: Fix CBA display on application with multiple windows Fix def files doc - document symbian behaviour of QFile::link Symbian - prefer sessions started by this process to choose proxy Freezing Def files in Qt Lightmaps demo Symbian fix CBA comes on top of option menu Fix memory leaks in OpenVG and OpenGL resource pools Fix sqlite driver memory eating due to close failure
| * | Lightmaps demo Symbian fixMarko Kenttala2011-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling night mode does not work on Symbian devices as it uses difference composition mode which is not available. Application changed to use raster graphics engine which supports difference composition mode. Task-number: ou1cimx1#932185 Reviewed-by: Murray Read
* | | 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
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-11-2920-0/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Set execution bits for more scripts. Set execution bits for .test files. Fix more permissions (no execute bit). Fix permission (no execute bit). QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
| * | Fix permission (no execute bit).Frederik Gladhorn2011-11-2224-0/+0
| | |
* | | Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-262-2/+2
|\ \ \ | |_|/ |/| |
| * | Doc: Fixing typoSergio Ahumada2011-08-172-2/+2
| | | | | | | | | | | | | | | | | | | | | Reducing the amount of spelling errors from NBN. Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86 Reviewed-by: Rohan McGovern
* | | Add note to declarative calculator exampleDaniel Molkentin2011-11-221-0/+6
| | | | | | | | | | | | | | | | | | | | | This example is not meant to be executed without qmlviewer, yet most of it works. Add a warning for the uninitiated. Reviewed-by: trustme
* | | Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-2210-17/+21
| | | | | | | | | | | | Rubberstamped-by: Oswald Buddenhagen
* | | Fix "make install" for declarative examplesDaniel Molkentin2011-11-223-4/+19
| | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen
* | | Update the license in the qmlapplicationviewer.Casper van Donderen2011-11-222-76/+76
| | | | | | | | | | | | | | | | | | The license had too many comments in them, these are now removed Reviewed-By: Trust me
* | | Examples: Add Copright headers, Remove stray file.Daniel Molkentin2011-11-222-16/+78
| | | | | | | | | | | | Reviewed-by: trustme
* | | Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-2112-9/+411
| | | | | | | | | | | | | | | | | | | | | - Two separate copies for demos and example - Fix deployment (don't install to opt in desktop case) Reviewed-by: Casper van Donderen
* | | Update qrc files.Casper van Donderen2011-11-181-16/+15
| | | | | | | | | | | | | | | | | | | | | The qml files were moved within the examples, the qrc files were not updated accordingly. This change fixes the problem. Reviewed-By: Daniel Molkentin
* | | demos/declarative/snake example correctionsartoka2011-11-172-3/+1
| | | | | | | | | | | | | | | | | | | | | Removed empty lines from snake.qml and Cookie.qml Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | demos/declarative/webbrowser example modificationsartoka2011-11-1722-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | demos/declarative/twitter example modificationsartoka2011-11-1730-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | demos/declarative/snake example modificationsartoka2011-11-1732-4/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | demos/declarative/samegame example modificationsartoka2011-11-1727-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | demos/declarative/rssnews example modificationsartoka2011-11-1716-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | demos/declarative/photoviewer example modificationsartoka2011-11-1725-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | demos/declarative/minehunt example modificationsartoka2011-11-1719-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | demos/declarative/flickr example modificationsartoka2011-11-1730-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | demos/declarative/calculator example modificationsartoka2011-11-1719-5/+211
| |/ |/| | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-264-4/+4
|\ \ | |/
| * Fix files that don't end with a newline characterSergio Ahumada2011-08-124-4/+4
| | | | | | | | | | | | | | | | These are cosmetic changes to files that do not end with a newline character. Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a Reviewed-by: Rohan McGovern
* | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-181-1/+1
|/ | | | | Merge-request: 1299 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-081-0/+1
|\
| * Update the Window title when closing the last tab.Casper van Donderen2011-07-071-0/+1
| | | | | | | | | | | | Fixes: QTBUG-20243 Reviewed-By: Kevin Wright
* | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-271-17/+17
| | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1711-9/+504
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-095-9/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits) Update internal state before emitting configurationChanged() signals. Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain. Reset input context in Symbian when another window is opened. KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget() Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always. Update Japanese translations. Revert some of "Make QMLViewer startup animation stop after a while" Fix for winscw QtGui.def Add private method for flushing the pixmap cache. QDeclarative: Fix QPerformanceTimer on Symbian Fix QTreeWidget autotest cases on Symbian/VGA Increase SSL readbuffer 1 -> 16 kB Fix pixel metrics for Symbian VGA devices Revert "Fix QNetworkConfigurationManager usage outside main thread first" Avoid buffer overrun in QMacPixmapData resizing Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting Fix tst_QGraphicsItem::sorting() test case for Symbian Fix QHeaderView test case for VGA Symbian devices. ...
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-082-0/+8
| | |\ \ | | | |/
| | | * Have -small-screen enabled in certain examples on Symbian always.Laszlo Agocs2011-06-062-0/+8
| | | |
| | | * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-253-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch applies everything from the original, except for the filename case changes in LIBS which are handled differently based on the auto-detected is_using_gnupoc CONFIG value. Reviewed-by: Laszlo Agocs
| | | * Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-253-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
View Lorry Controller Status