summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Replaced Nokia copyrights in headerTeemu Kaukoranta2013-07-1037-74/+73
| | | | | | | | | | | | | | | | | | | | | | | | | Replaced old Nokia copyrights with Digia copyrights. Removed "All rights reserved" strings without leading copyrights were removed (for example, 'Copyright SomeCompany, all rights reserved remain untouched). Did NOT touch contact details, will change them later. Excluded folders that have '3rdparty' in path. Used command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,10 s/([ #*]*)(.*Copyright.*Nokia.*)/ \1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I') >(xargs sed -i -r '1,10 s/(^[ #*]*)(all rights reserved.*)/\1/I') This excludes binary files and retains whitespace and #* characters in the beginning of the edited lines. Fixed "all rights reserved" that didn't get removed completely. Change-Id: Iec19ee5ca4fd7e0735a234955fe1648f1f71d206 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131714-1722/+1722
| | | | | | 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-291714-10581/+10581
| | | | | | | | 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>
* fix examples/script/qscript for MSVCJoerg Bornemann2012-09-171-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 (cherry picked from commit qtscript/6bc42fb243edf5870c82cca6c53824a588007faf) Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* examples: Add dockwidgets to the list of examplesSergio Ahumada2012-08-061-0/+1
| | | | | | | This example is needed by tst_GuiAppLauncher::run() Change-Id: I4ad828006bb0b801eefc374950f1345fdf2b0f8b Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011711-3422/+3422
| | | | | | | | | | | | | - 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>
* Add missing files about SpinnerSukhyun Kim2012-06-074-1/+71
| | | | | | | Add missing files and update qml file Change-Id: Ic9c2279b665d06a33e4f0f9484cf9a0ff648bc23 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* getting started: better names for main() argumentshjk2012-05-105-10/+10
| | | | | Change-Id: Ibc9cdd89503fc085ed0441ff34cbe2f729e67066 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove build_all when target is same for debug and releaseSamuli Piippo2012-04-307-0/+35
| | | | | | | | | | | Change build rules for projects where both debug and release target are the same file. For these, it makes no sense building both targets, as they overwrite each other. Now build only release target, when build_all is used. Change-Id: Iffd1076028b1cc91e8151c346bf4761772dafe65 Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix TypeErrorsh kim2012-03-272-2/+2
| | | | | | | | A example has errors about TypeError Change-Id: Ie6e9c769e83c5a3410c1131383c50dfedb828c41 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@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>
* Fixed Qt examples building when QT_NO_GESTURES is used.jaanttil2012-02-071-0/+2
| | | | | | | | | | Gesture examples were always enabled regardless the used Qt configuration. Added check for QT_NO_GESTURES to examples.pro, and included gestures examples only when needed. Change-Id: Ic8789aedb1251a3827191c647d4b0c4d5a1b6306 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Exclude helloconcurrent when QtConcurrent is not configuredSamuli Piippo2012-02-061-1/+1
| | | | | | | Task-number: QTBUG-23874 cherry-picked from qtbase c8156cab81690526adffa22214657fc1c6563b8b Change-Id: I371a3eb3f4145d80e9f51fe89d61bac5c269d587 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1139-39/+39
| | | | | | | | 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-111712-1720/+1720
| | | | | | | | | 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-061-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
* | Fix QtDemo declarative examplesAlan Alpert2011-12-021-0/+1
| | | | | | | | | | | | | | | | 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
* | Correct image paths for dynamicsceneAlan Alpert2011-12-021-5/+5
| | | | | | | | | | Task-number: QTBUG-22937 Reviewed-by: Chris Adams
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-11-29251-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-22292-0/+0
| |
* | Added missing license header.Rohan McGovern2011-11-251-0/+40
| |
* | Adjust pathes once again.Daniel Molkentin2011-11-241-3/+3
| | | | | | | | Reviewed-by: trustme
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-249-0/+10
|\ \
| * | Rename files to show up in docs.Casper van Donderen2011-11-249-0/+10
| | |
* | | Split behavior and wigglytext examplesKevin Wright2011-11-246-0/+204
|/ /
* | Fix up examples.Daniel Molkentin2011-11-24175-2955/+49
| | | | | | | | | | | | | | | | | | - Remove dependencies from examples - Remove stray copies of qtc_packaging - remove .desktop files - rename examples (to their old name) Reviewed-By: Casper van Donderen
* | Removed unecessary files from folders.Kevin Wright2011-11-2416-532/+0
| |
* | Removed unecessary duplicate files.Kevin Wright2011-11-2428-1696/+0
| |
* | Fix abstractitemmodel compilation error.Daniel Molkentin2011-11-242-7/+0
| |
* | Update documentation for QML examples.Casper van Donderen2011-11-241-0/+3
| |
* | Compile fix for Mac OS X.Daniel Molkentin2011-11-241-1/+1
| | | | | | | | Reviewed-By; Casper van Donderen
* | Fix build error: specifying full path to pro file is required here.Daniel Molkentin2011-11-233-6/+6
| | | | | | | | Reviewed-By: Oswald Buddenhagen
* | Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-2263-63/+130
| | | | | | | | Rubberstamped-by: Oswald Buddenhagen
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-2212-20/+81
|\ \
| * | Fix "make install" for declarative examplesDaniel Molkentin2011-11-2212-20/+81
| | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen
* | | Change installation location of examples.Casper van Donderen2011-11-2214-30/+30
|/ / | | | | | | | | | | The cppextensions examples were still installed to a previous location, the files had been moved within the source tree, but the .pro files were not changed accordingly.
* | 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-223-166/+78
| | | | | | | | Reviewed-by: trustme
* | Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-2167-64/+282
| | | | | | | | | | | | | | - 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-1/+1
| | | | | | | | | | | | | | The qml files were moved within the examples, the qrc files were not updated accordingly. This change fixes the problem. Reviewed-By: Daniel Molkentin
* | Update qmlapplicationviewer template,Casper van Donderen2011-11-173-146/+115
| | | | | | | | | | | | | | | | The previous version of the template did not work on Harmattan, It caused the application executable to look in the $HOME directory, instead of the application directory. Reviewed-By: Daniel Molkentin
* | cppextensions/qgraphicslayout example correctionsartoka2011-11-172-31/+0
| | | | | | | | | | | | | | Cleaned qgraphicsgridlayout.pro and qgraphicslinearlayout.pro files. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | xml/xmlhttprequestexample example modificationsartoka2011-11-178-436/+6
| | | | | | | | | | | | | | | | | | 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>
* | ui-components/tabwidget example modificationsartoka2011-11-1711-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>
* | ui-components/spinner example modificationsartoka2011-11-179-30/+166
| | | | | | | | | | | | | | | | | | 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>
* | ui-components/slideswitch example modificationsartoka2011-11-1712-604/+6
| | | | | | | | | | | | | | | | | | 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>
* | ui-components/searchbox example modificationsartoka2011-11-1713-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>
* | ui-components/scrollbar example modificationsartoka2011-11-1711-4/+210
| | | | | | | | | | | | | | | | | | 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>
* | ui-components/progressbar example modificationsartoka2011-11-1711-592/+6
| | | | | | | | | | | | | | | | | | 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>
generated by cgit v0.12 at 2024-11-30 01:06:52 (GMT)