summaryrefslogtreecommitdiff
path: root/examples/webkitqml/shared/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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-191-2/+2
| | | | | | | | | | | | | 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-071-1/+1
| | | | | | 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>
* Adjust webkit example project install targets.hjk2012-12-101-0/+50
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