diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:30:17 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:30:17 +0200 |
commit | 4f5cbf66effb9e044da7be9904a6db493d8b2611 (patch) | |
tree | fb886e83bf20336eae85142f65bed64f10e97995 | |
parent | 16fc04fe54c2838cd697845d2fe540b7be500b5e (diff) | |
parent | a4db690e3d09d2341b101557fa2875423db192d2 (diff) | |
download | qtwebkit-examples-4f5cbf66effb9e044da7be9904a6db493d8b2611.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: Iab6cfb72de2d9ad06d35d5b98e1cf8b369a29e00
-rw-r--r-- | dist/changes-5.1.0 | 22 | ||||
-rw-r--r-- | doc/qtwebkitexamples.qdocconf | 4 | ||||
-rw-r--r-- | doc/src/qtwebkit-examples.qdoc | 2 | ||||
-rw-r--r-- | examples/webkitqml/flickrview/flickrview.qmlproject | 16 | ||||
-rw-r--r-- | examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc | 2 | ||||
-rw-r--r-- | examples/webkitqml/youtubeview/youtubeview.qmlproject | 16 | ||||
-rw-r--r-- | examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq | 2 | ||||
-rw-r--r-- | qtwebkit-examples-and-demos.pro | 4 | ||||
-rw-r--r-- | qtwebkit-examples.pro | 5 | ||||
-rw-r--r-- | sync.profile | 17 |
10 files changed, 41 insertions, 49 deletions
diff --git a/dist/changes-5.1.0 b/dist/changes-5.1.0 new file mode 100644 index 0000000..1f8dac6 --- /dev/null +++ b/dist/changes-5.1.0 @@ -0,0 +1,22 @@ +Qt 5.1 introduces many new features and improvements as well as bugfixes +over the 5.0.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.1 + +The Qt version 5.1 series is binary compatible with the 5.0.x series. +Applications compiled for 5.0 will continue to run with 5.1. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + + - Rename QtWebKit Examples and Demos to QtWebKit Examples diff --git a/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf index e0228ba..d87e530 100644 --- a/doc/qtwebkitexamples.qdocconf +++ b/doc/qtwebkitexamples.qdocconf @@ -1,8 +1,8 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtWebKitExamples -description = "Qt WebKit Examples and Demos Documentation" -url = http://qt-project.org/doc/qt-$QT_VER/qtwebkitexamples +description = "Qt WebKit Examples Documentation" +url = http://qt-project.org/doc/qt-$QT_VER/qtwebkitexamples version = $QT_VERSION # Defines the name of the project. You cannot use operators (+, =, -) in diff --git a/doc/src/qtwebkit-examples.qdoc b/doc/src/qtwebkit-examples.qdoc index 2737d58..e2417b0 100644 --- a/doc/src/qtwebkit-examples.qdoc +++ b/doc/src/qtwebkit-examples.qdoc @@ -61,7 +61,7 @@ /*! \group webkit-qmlexamples - \title Qt Webkit Examples and Demos + \title Qt Webkit Examples \brief QML examples demonstrating Webkit features \ingroup all-examples diff --git a/examples/webkitqml/flickrview/flickrview.qmlproject b/examples/webkitqml/flickrview/flickrview.qmlproject deleted file mode 100644 index 7f47c02..0000000 --- a/examples/webkitqml/flickrview/flickrview.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.1 - -Project { - mainFile: "flickrview.qml" - - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } -} diff --git a/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc b/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc index 8209c05..ed1cdb2 100644 --- a/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc +++ b/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc @@ -36,7 +36,7 @@ \image youtubeview-example.png - The applicaiton makes use of an \l{XmlListModel} to query the \l{https://developers.google.com/youtube}{YouTube API} + The application makes use of an \l{XmlListModel} to query the \l{https://developers.google.com/youtube}{YouTube API} for HTML5 video clips and lists thumbnails of the clips in a \l{ListView} at the top. The \l{WebView} loads a local \c player.html file that embeds a YouTube HTML5 video player using the \l{https://developers.google.com/youtube/iframe_api_reference}{IFrame player API}, which allows to control the YouTube player using JavaScript. diff --git a/examples/webkitqml/youtubeview/youtubeview.qmlproject b/examples/webkitqml/youtubeview/youtubeview.qmlproject deleted file mode 100644 index 51f0a40..0000000 --- a/examples/webkitqml/youtubeview/youtubeview.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.1 - -Project { - mainFile: "youtubeview.qml" - - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } -} diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq index 14a7a14..8d5dcb2 100644 --- a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq +++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq @@ -1,6 +1,6 @@ <html> <head> - <title></title> + <title>Generated statistics</title> </head> <body> <p>In total the tree has {count($root//QObject)} QObject instances.</p> diff --git a/qtwebkit-examples-and-demos.pro b/qtwebkit-examples-and-demos.pro deleted file mode 100644 index c6ad8c8..0000000 --- a/qtwebkit-examples-and-demos.pro +++ /dev/null @@ -1,4 +0,0 @@ -requires(qtHaveModule(webkit)) - -TEMPLATE = subdirs -SUBDIRS += examples doc diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro new file mode 100644 index 0000000..3fcecf1 --- /dev/null +++ b/qtwebkit-examples.pro @@ -0,0 +1,5 @@ +requires(qtHaveModule(webkit)) + +load(qt_parts) + +SUBDIRS += doc diff --git a/sync.profile b/sync.profile index b72775f..5a7a8e7 100644 --- a/sync.profile +++ b/sync.profile @@ -3,14 +3,15 @@ # Each of the module version specifiers can take one of the following values: # - A specific Git revision. # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) +# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) # %dependencies = ( - "qtbase" => "refs/heads/dev", - "qtwebkit" => "refs/heads/dev", - "qtscript" => "refs/heads/dev", - "qtsvg" => "refs/heads/dev", - "qtxmlpatterns" => "refs/heads/dev", - "qtdeclarative" => "refs/heads/dev", - "qtjsbackend" => "refs/heads/dev", - "qttools" => "refs/heads/dev", + "qtbase" => "", + "qtwebkit" => "", + "qtscript" => "", + "qtsvg" => "", + "qtxmlpatterns" => "", + "qtdeclarative" => "", + "qtjsbackend" => "", + "qttools" => "", ); |