summaryrefslogtreecommitdiff
path: root/examples/webkitqml
Commit message (Collapse)AuthorAgeFilesLines
* QML Examples: Remove .qmlproject filesv5.1.0-beta1Kai Koehne2013-05-072-32/+0
| | | | | | | | | The examples use qrc nowadays, so you can't launch them via qmlscene. Avoid confusion by only offering the .pro file. Change-Id: I6f9b3d1246e62172969a34840ab6c550899d2583 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix typo in docsKai Koehne2013-05-071-1/+1
| | | | | Change-Id: I7cda7d37cdeec52ded3256e62e31a1e95c8b9c43 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix the build of the QML examples if C++11 is enabledAndras Becsi2013-03-251-1/+1
| | | | | | | | | | | | The build fails with the following error message: unable to find string literal operator 'operator"" QWEBKIT_EXAMPLE_NAME' Add spaces around the define so that it is not interpreted as an operator expression. Change-Id: I0bdb10ab844441c280a1bd6ffaf75e0e2604f9da Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Package resources for webkit qml examples in resource files.Michael Brüning2013-02-1911-21/+48
| | | | | | | | | | | | | This adds qrc files for the two webkit qml examples and a shared one to package shared resources. Depends on the fix for https://bugs.webkit.org/show_bug.cgi?id=107031 being merged to the Qt WebKit module. Task-number: QTWEBKIT-388 Change-Id: If02b6cfe72acd9b3d2a09b525b035646d1538dc7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-078-8/+8
| | | | | | Change-Id: I08bbc366f34784f5dbc0fa38d7cef33189edd1cf Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Compile in C++11 mode: spaces between string literal concatenationsThiago Macieira2012-12-181-1/+1
| | | | | | | | Or we get the error: main.cpp:46:118: error: unable to find string literal operator 'operator"" QWEBKIT_EXAMPLE_NAME' Change-Id: Ic13fa250329f18f9b847468764bd00258df34c7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix webkit example manifest generation.Eike Ziller2012-12-132-2/+2
| | | | | | Change-Id: Ia23f65e754932955f86276f5c2ff901de75ca4a0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Doc: Added documentation for the WebKit Widget examplesVenugopal Shivashankar2012-12-122-4/+8
| | | | | | | | | | - Moved the qdoc files from the qtdoc repository - Added group pages for QML and QWidget-based examples - Added an index page - Updated the qhp details in the qdocconf Change-Id: I5f79fb1aedbfc3bcb42c84ac774ea1c4bd3a9036 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add brief documentation for flickrview and youtubeviewAndras Becsi2012-12-115-0/+101
| | | | | Change-Id: I69a01221019fa62215d1d3ec1e312c6ba138fd79 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Re-add the webkit dependency for QML examples.Pierre Rossi2012-12-102-2/+2
| | | | | | | | | | removing the webkitwidgets dependency was right, but they still depend on webkit. My bad. Change-Id: Ie907ea0853198905dde6ab24b10e819f62f8d754 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Adjust webkit example project install targets.hjk2012-12-1019-0/+1174
This follows suit with aeb036e in qtbase. Change-Id: Ifc85b327df81d15f3579b911e07c95a3b7a3bb9d Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
View Lorry Controller Status