Qt

lp:~neon/qt/qtwebkit-examples-and-demos

Created by Philip Muškovac and last modified
Get this branch:
bzr branch lp:~neon/qt/qtwebkit-examples-and-demos

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
Qt
Status:
Development

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at git://gitorious.org/qt/qtwebkit-examples-and-demos.git.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on pear and finished taking 15 seconds — see the log
Import started on pear and finished taking 15 seconds — see the log
Import started on pear and finished taking 30 seconds — see the log
Import started on pear and finished taking 20 seconds — see the log

Recent revisions

75. By Oswald Buddenhagen <email address hidden>

use qt_parts.prf

this makes "configure -nomake examples" apply to this repo as well.

Change-Id: I64ee4fd67b9babf533fcfcfc022e9df085ac57de
Reviewed-by: Joerg Bornemann <email address hidden>

74. By Sergio Ahumada <email address hidden>

Bump MODULE_VERSION to 5.1.0

Change-Id: I61ad349fc3ebd49fba3bc3b5ddc12df2e42ac8c7
Reviewed-by: Oswald Buddenhagen <email address hidden>

73. By Andras Becsi <email address hidden>

Fix the build of the QML examples if C++11 is enabled

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 <email address hidden>
Reviewed-by: Pierre Rossi <email address hidden>

72. By Andras Becsi <email address hidden>

The QT_NO_PRINTER guard is too generic if QPrintDialog is disabled

Use QT_NO_PRINTDIALOG and QT_NO_PRINTPREVIEWDIALOG instead of
QT_NO_PRINTER to guard QPrintDialog and QPrintPreviewDialog
respectively to fix the build if printing is enabled but
dialogs are not.

Change-Id: I7c083c32b1ff0d2ea0793873533d184c067f01cd
Reviewed-by: Michael Bruning <email address hidden>
Reviewed-by: Pierre Rossi <email address hidden>

71. By Sergio Ahumada <email address hidden>

Merge "Merge branch 'dev' into stable" into refs/staging/stable

70. By Jonathan Liu

Namespace jQuery to avoid potentional conflicts

The fancy browser example loads jQuery but web pages may already load
their own jQuery which may conflict.

Task-number: QTBUG-28959
Change-Id: I6868764012f36d72362010d3e0a77ba0320f24ba
Reviewed-by: Jocelyn Turcotte <email address hidden>

69. By Oswald Buddenhagen <email address hidden>

Merge remote-tracking branch 'origin/release' into stable

Change-Id: I6cfd392417a05f3e4877e29c1843a4ff004923aa

68. By Michael Brüning <email address hidden>

Package resources for webkit qml examples in resource files.

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 <email address hidden>

67. By Oswald Buddenhagen <email address hidden>

substitute fixed version numbers in qdocconf files with variables

Change-Id: I15a2d228996bc87e4a25436715c0cefabbb15faf
Reviewed-by: Jerome Pasion <email address hidden>

66. By Sergio Ahumada <email address hidden>

Merge branch 'release' into stable

Change-Id: I0ff240135fb13ed08f99eb1d2a7641210875feb4

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.