summaryrefslogtreecommitdiffstats
path: root/examples/declarative/modelviews/webview
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-0111-22/+22
| | | | | | | | | | | | | - 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>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1111-11/+11
| | | | | | | | | 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 up examples.Daniel Molkentin2011-11-2425-596/+8
| | | | | | | | | - 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
|
* Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-225-5/+10
| | | | Rubberstamped-by: Oswald Buddenhagen
* Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-215-5/+10
| | | | | | | - Two separate copies for demos and example - Fix deployment (don't install to opt in desktop case) Reviewed-by: Casper van Donderen
* Modelviews Examples Modificationsartoka2011-11-1792-2625/+43
| | | | | | | | | | | | modelviews/webview/ alerts, autosize, googlemaps, inlinehtml and newwindows example modifications Modified examples 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>
* Doc: Added missing license headers for documentation and examples.David Boddie2011-06-0815-0/+600
|
* Squashed merge of the master-temp branch.David Boddie2011-05-061-0/+16
| | | | | Conflicts: doc/src/examples/maemovibration.qdoc
* Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-28118-0/+5784
| | | | (4.7-generated-declarative branch).
* Update copyright year to 2011.Jason McDonald2011-01-106-6/+6
| | | | Reviewed-by: Trust Me
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-296-6/+6
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Doc: Fixed text in license headers.David Boddie2010-09-136-6/+6
|
* Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-226-6/+6
|\ | | | | | | | | Conflicts: examples/declarative/modelviews/webview/transparent.qml
| * Fix WebKit declarative examples (second try)Simon Hausmann2010-06-221-1/+1
| | | | | | | | | | | | Forgot one occurrence of org.webkit :) Reviewed-by: Trust me
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-226-6/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | * Fix examplesSimon Hausmann2010-06-216-6/+6
| | | | | | | | | | | | | | | | | | Import QtWebKit instead of org.webkit Reviewed-by: Trust me
* | | Remove transparent.qml example for now, until QTBUG-11591 is fixedBea Lam2010-06-221-55/+0
|/ /
* | Clean up some examplesBea Lam2010-06-227-279/+33
|/
* Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-311-2/+0
| | | | | | By making selectionStart/End read-only, and adding adding select(). Task-number: QTBUG-11056
* geolocation (untested)Warwick Allison2010-05-251-0/+8
|
* Add license headers for .qml files.Jason McDonald2010-05-219-0/+360
| | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* Restructure the examples. They are now organized into variousBea Lam2010-05-1615-0/+508
subdirectories to make it easier to locate examples for certain features (e.g. animation) and to distinguish between different types of examples (e.g. very basic examples vs complex demo-like examples).