Hi there.
Please find attached a patch for qtwebkit-examples-and-demos that allows
the build to complete on Debian Wheezy amd64.
Please also note that this patch includes a previously submitted patch,
not yet applied.
Also, examples/webkit/fancybrowser/fancybrowser.pro contains a
TARGET.EPOCHEAPSIZE in symbian{} that seems to contain invalid utf-8
characters.
Regards,
Philip Ashmore
diff --git a/examples/browser/browser.pro b/examples/browser/browser.pro
index 283e3c1..0f454cc 100644
--- a/examples/browser/browser.pro
+++ b/examples/browser/browser.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = browser
-QT += webkit network widgets printsupport
+QT += webkit network widgets printsupport quick
CONFIG += qt warn_on
contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools
diff --git a/examples/browser/cookiejar.cpp b/examples/browser/cookiejar.cpp
index d65573d..194f25b 100644
--- a/examples/browser/cookiejar.cpp
+++ b/examples/browser/cookiejar.cpp
@@ -61,7 +61,7 @@
#include <QtWebKit/QWebSettings>
#include <QtCore/QDebug>
-
+#include <QNetworkCookie>
static const unsigned int JAR_VERSION = 23;
QT_BEGIN_NAMESPACE
diff --git a/examples/embedded/anomaly/anomaly.pro b/examples/embedded/anomaly/anomaly.pro
index 005aa3f..67a5236 100644
--- a/examples/embedded/anomaly/anomaly.pro
+++ b/examples/embedded/anomaly/anomaly.pro
@@ -1,6 +1,8 @@
QT += network \
webkit \
- widgets
+ widgets \
+ quick
+
HEADERS += src/BrowserWindow.h \
src/BrowserView.h \
src/TitleBar.h \
diff --git a/examples/webkit/domtraversal/domtraversal.pro b/examples/webkit/domtraversal/domtraversal.pro
index 4db769a..b9f38d3 100644
--- a/examples/webkit/domtraversal/domtraversal.pro
+++ b/examples/webkit/domtraversal/domtraversal.pro
@@ -1,4 +1,4 @@
-QT += webkit network widgets
+QT += webkit network widgets quick
FORMS = window.ui
HEADERS = window.h
SOURCES = main.cpp \
diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro
index 18fbec5..faa006f 100644
--- a/examples/webkit/fancybrowser/fancybrowser.pro
+++ b/examples/webkit/fancybrowser/fancybrowser.pro
@@ -1,4 +1,4 @@
-QT += webkit network widgets
+QT += webkit network widgets quick
HEADERS = mainwindow.h
SOURCES = main.cpp \
mainwindow.cpp
@@ -12,7 +12,7 @@ INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000CF6C
- TARGET.EPOCHEAPSIZE = 0×020000 0×4000000
+ TARGET.EPOCHEAPSIZE = 0�020000 0�4000000
TARGET.CAPABILITY += Location NetworkServices
CONFIG += qt_example
}
diff --git a/examples/webkit/framecapture/framecapture.pro b/examples/webkit/framecapture/framecapture.pro
index 3f39bef..f1d3d24 100644
--- a/examples/webkit/framecapture/framecapture.pro
+++ b/examples/webkit/framecapture/framecapture.pro
@@ -1,4 +1,4 @@
-QT += webkit network widgets
+QT += webkit network widgets quick
HEADERS = framecapture.h
SOURCES = main.cpp \
diff --git a/examples/webkit/googlechat/googlechat.pro b/examples/webkit/googlechat/googlechat.pro
index 39784cd..5d83602 100644
--- a/examples/webkit/googlechat/googlechat.pro
+++ b/examples/webkit/googlechat/googlechat.pro
@@ -1,4 +1,4 @@
-QT += webkit network widgets
+QT += webkit network widgets quick
HEADERS = googlechat.h
SOURCES = main.cpp \
googlechat.cpp
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.cpp b/examples/webkit/imageanalyzer/imageanalyzer.cpp
index 11309e3..fad1aa1 100644
--- a/examples/webkit/imageanalyzer/imageanalyzer.cpp
+++ b/examples/webkit/imageanalyzer/imageanalyzer.cpp
@@ -43,6 +43,8 @@
#include <QNetworkRequest>
#include <QNetworkAccessManager>
#include <QNetworkDiskCache>
+#include <QtConcurrent>
+
#include "imageanalyzer.h"
/*!
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.pro b/examples/webkit/imageanalyzer/imageanalyzer.pro
index d48d2e1..25677b3 100644
--- a/examples/webkit/imageanalyzer/imageanalyzer.pro
+++ b/examples/webkit/imageanalyzer/imageanalyzer.pro
@@ -5,7 +5,7 @@ SOURCES = imageanalyzer.cpp \
main.cpp \
mainwindow.cpp
-QT += network webkit widgets
+QT += network webkit widgets concurrent
RESOURCES = resources/imageanalyzer.qrc
diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro
index a00db22..42ee20f 100644
--- a/examples/webkit/previewer/previewer.pro
+++ b/examples/webkit/previewer/previewer.pro
@@ -1,4 +1,4 @@
-QT += webkit network widgets
+QT += webkit network widgets quick
HEADERS = previewer.h \
mainwindow.h
SOURCES = main.cpp \
_______________________________________________
Development mailing list
[email protected]
http://lists.qt-project.org/mailman/listinfo/development
