summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1Frederik Gladhorn2015-02-241-1/+1
|\
| * Fix Url in layoutitem example.Friedemann Kleint2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: WARNING: Unexpected stderr: QDeclarativeComponent: Component is not ready QGraphicsLinearLayout::insertItem: cannot insert null item found while mass-testing examples. Change-Id: I0af369ca7f4d59d822ed7b0c8bd8dcd4cc34ead7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Update copyright headersAntti Kokko2015-02-23484-2142/+2142
|/ | | | | | | | | 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: I9e68d256991ef7325c29c38ce9c007506ce6b150 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2564-1216/+704
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I736aeb1a53f8aac59e8df360447864fea64d3dee Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-1110-10/+10
|\ | | | | | | Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
| * Fix typos in comments and documentationSergio Ahumada2014-03-0510-10/+10
| | | | | | | | | | Change-Id: Ie7c4d63d632bf32ee583ddcd807252225ddde3fd Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | whitespace fixesOswald Buddenhagen2014-02-20193-729/+729
|/ | | | | | | | remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-121-0/+2
|\ | | | | | | Change-Id: Ie11564446e707146f266f384fce794bd34b9d5f7
| * Fix compiler warning in example.old/5.2Christian Kandeler2014-01-291-0/+2
| | | | | | | | | | Change-Id: Ie57d6e5c8811a7845c55a069150de2fe0f796599 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Fix warning about unused variables in getting-started tutorial.Friedemann Kleint2014-01-291-0/+2
|/ | | | | Change-Id: Ic7945d59fb0dd207997698259e770af626f9e7e7 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix QML file in wigglytext-example.Friedemann Kleint2013-11-221-1/+1
| | | | | | Task-number: QTBUG-33871 Change-Id: I0dcd1fa10d82b929161afb044867983675064247 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Move Qt Quick 1 demos and their documentationold/5.1Topi Reinio2013-09-16187-28/+32
| | | | | | | | | | | | | | | When installing the examples, we currently end up with a QT_INSTALL_EXAMPLES/demos directory with nothing but documentation files. This change moves the docs and also the demos themselves into examples/declarative/demos. Also fixes the links in demo .qdoc files. Task-number: QTBUG-31722 Change-Id: Ied15526be1db8437e14be786ea69eae98af8dd3f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix compilation for -no-opengl buildKai Koehne2013-09-041-1/+0
| | | | | | | shadereffects is already included conditionally a few lines below. Change-Id: I8fd0a244708b0c5a820a0edc0fc9c9ce2e5513c0 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Change domain used in cpp-extensions-example.Friedemann Kleint2013-07-1810-13/+13
| | | | | | | Task-number: QTBUG-32390 Change-Id: I373183e096390bd1564c2d263190fb9063a733a2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Cleanup and fix the Getting Started tutorialJ-P Nurmi2013-05-1581-3757/+159
| | | | | | | | | | The tutorial got messed up by 04cb8ef1. This change restores the core/ folder from within the gsQml/ backup folder and then deletes it. Task-number: QTBUG-31082 Change-Id: Ie18af90dbc70812dc7e74fdd1389a8734cf62fd4 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Remove instructions for using qtdemo from examples READMETopi Reinio2013-04-161-35/+5
| | | | | | | | | The Qt Examples and Demos Launcher is not maintained anymore. Edit the README to mention Qt Creator as the way to find and launch examples. Task-number: QTBUG-28388 Change-Id: I507b0af3888185a0cb86a3e71cab9115b9275892 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-281-1/+1
| | | | | | Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-10520-520/+520
| | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix image source for networkaccessmanagerfactory exampleTopi Reinio2013-01-071-1/+1
| | | | | | | | | Change the image URL to point to an existing image. Task-number: QTBUG-28374 Change-Id: Ied1ea7911757b1098847cb074b71650f9cc44776 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-198-8/+8
| | | | | | | qt is already added by spec_pre.prf. Change-Id: Ie2cf7c733718319437a823993c09778507c423ef Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Added documentation for the quick1 demo applicationsv5.0.0-rc2Venugopal Shivashankar2012-12-1214-0/+263
| | | | | Change-Id: Iebc7c1e7202fed95abf231913b48cec75675e7f1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixed install path of tictactoe exampleOliver Wolff2012-12-121-1/+1
| | | | | Change-Id: I710152e833a74956060772d5e01772dea0298384 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* centralize and fixup example sources install targetsOliver Wolff2012-12-11445-350/+3832
| | | | | | | | follow respective change in qtbase Change-Id: I15346e16cd1d6f30cf32a77284b5f19b1dd2a7a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* remove symbian & maemo5 vestigesOswald Buddenhagen2012-12-046-51/+0
| | | | | Change-Id: I4c02f91abde94d9ee7d154efa6eb371e1a8dfd71 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix building of examples.Friedemann Kleint2012-11-2225-5/+110
| | | | | | | | | | - Correct install paths. - Add missing subdir-.pro files. - Add missing resources. Task-number: QTBUG-27977 Change-Id: Ia8293cbaa7b32280181f41bde5b6e517989571f8 Reviewed-by: hjk <qthjk@ovi.com>
* Fix Snake demoAlan Alpert2012-11-201-1/+1
| | | | | | | | | The runtime object is only exposed by qmlviewer. As the demo was changed to run from an executable instead, it no longer has access to this variable. Change-Id: I329342ac8f49c52331f9558111cb192e08bd89da Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Examples: Removed Symbian and MeeGo examples.Jerome Pasion2012-11-13240-15694/+0
| | | | | | | | Those platforms are not in scope for Qt 5.0 Change-Id: I70ee233ddfea3d15dc8a3e7d6cc6b1b43f1c7ba6 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Separate qtquick1 example install paths from qtdeclarative examplesv5.0.0-beta2Topi Reinio2012-11-0582-98/+98
| | | | | | | | | | | | | | After QtQuick1 -> QtDeclarative name change (79fed875), the examples both in qtquick1 and qtdeclarative use the same install path, causing conflicts. This change restores the install path used by qtquick1 examples as its own subdirectory under QT_INSTALL_EXAMPLES. Task-number: QTBUG-27823 Change-Id: Ica9ab8c5984642ace934e694cba346bcd3a1cb4c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Updated QmlApplicationViewer for QtQuick1 examplesTopi Reinio2012-11-055-176/+164
| | | | | | | | | | | | | | | - Copy the latest QmlApplicationViewer from qt-creator (4eedda04) - Include deployment.pri in qmlapplicationviewer.pri - Reorganize deployment.pri so that INSTALLS is generated for all plaforms (No INSTALLS was generated for non-unix platforms) - Remove Symbian-specific remnants (CAPABILITY, EPOCHEAPSIZE) Task-number: QTBUG-26197 Change-Id: I329342ac8f49c52331f9558111cb192e08bd89d4 Reviewed-by: Leonard Lee <leonard.lee@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-17106-143/+143
| | | | | | | | | | | | | | | | | Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24543-5526/+5526
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove Symbian platformKai Koehne2012-09-1866-815/+4
| | | | | Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix install paths of demos and examples.Andrew den Exter2012-08-03514-111/+24255
| | | | | | | | | | | | | | | Install all demos and examples to the qtquick1 subdirectory of the examples install location, demos under a demos folder, declarative examples under a declarative folder and the common viewer code under a helper folder. This mirrors the directory structure of the src directory and ensures the examples sources can be built from the install location. Task-number: QTBUG-26663 Change-Id: I406f4fa58e5f004eb1aef5902fa2d6267517943d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add missing spinner example files.Martin Jones2012-06-214-1/+71
| | | | | | Task-number: QTBUG-26217 Change-Id: I90daffce389c92f7e5e8c78378d8787023d9a9ba Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix package example.Martin Jones2012-06-211-1/+1
| | | | | | Task-number: QTBUG-26211 Change-Id: Ia00ca5e8136e787521addb3122888c4b6fa3e168 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Make a click in highlight example set the currentIndexMartin Jones2012-06-211-0/+1
| | | | | | Task-number: QTBUG-26210 Change-Id: Id5999971968736cd5856eccafdb9c3636bb9c44c Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Install qtquick1 examples to qtquick1 folderAlan Alpert2012-06-1973-89/+89
| | | | | | Task-number: QTBUG-26010 Change-Id: Ifeaf1ae2bc61a3e4d7a2da5ae628a5e6934d5aea Reviewed-by: Martin Jones <martin.jones@nokia.com>
* QAbstractItemModel::setRoleNames is not necessary.Thiago Macieira2012-05-072-4/+10
| | | | | | | We have a proper virtual in Qt 5 now, so use it. Change-Id: Ieff72a7cb6feb17282f600d8d21e3f4fbe1914a4 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Use new plugin system in QtQuick1 examples/demos.Friedemann Kleint2012-02-288-9/+7
| | | | | | Change-Id: I76f930c32688d596aa58e28eb1d46e1ddeb57b4b Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Make the gettingStarted example runnable.Matthew Vogt2012-02-273-52/+12
| | | | | | | | | Remove the copyright header from the qmldir file, which causes it not parse correctly. Also update the delegate used in the file dialog to use the current syntax. Change-Id: I9452207fff5246389cdf54d862dd362942819ce3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-2212-59/+9
| | | | | | | remove assignmets which are defaults or bogus Change-Id: I01cc654755a3e04b027c220ac6c19357ffeeb8a0 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Use new plugin system in QtQuick1.Friedemann Kleint2012-02-2113-12/+23
| | | | | | | | - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I157206ad883be16fb85b9b6bffca7200532561e4 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QtQuick1: Fix warnings of gcc 4.6Friedemann Kleint2012-02-081-2/+0
| | | | | | | | - Fix warnings. - Remove duplicate entries from profile. Change-Id: I7b4a3cd71ec7d1c11b3530c95f57fef3a3041b16 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix license header format.Matthew Vogt2012-02-07413-826/+413
| | | | | Change-Id: Ib71237ed181d075329a0267b5c108e6534c13e4e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* QtQuick1: Fix compilation on Windows.Friedemann Kleint2012-02-073-3/+3
| | | | | | | | - Add missing modules, includes. - Fix warnings. Change-Id: I21a6107db6c5978ccfd59c4202cf31e3deba19ca Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix license headers to match conventions.Matthew Vogt2012-02-07413-464/+862
| | | | | | | | Files updated to mtach licensing conventions for different types, and license text updated to match current. Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Remove WebView visual tests and examples.Andrew den Exter2012-02-0638-1588/+1
| | | | | | | QDeclarativeWebView isn't part of the QtQuick1 module. Change-Id: Ibe0af84018692e3db5a7a93961972b5089a79f1c Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Modify QtQuick1 to build in Qt5Matthew Vogt2012-01-3195-136/+109
| | | | | Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-30983-0/+50277
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 03:51:53 +0000