diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-21 09:08:58 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-21 10:25:55 +0100 |
| commit | 7e24b4fad3c661d8cdabe9e45c7eff9b5e4d1af6 (patch) | |
| tree | 227bf935e95bc841bfbb6a7c8e7bb1cfe6a10124 | |
| parent | 6a3de98b02b6cfa1028922ab47565c921095341f (diff) | |
Compile fix.qt-v5.0.0-alpha1
Change-Id: I9a618c9e6f60828b6eb7f1872f1c345fbdc37056
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| -rw-r--r-- | examples/browser/cookiejar.cpp | 1 | ||||
| -rw-r--r-- | examples/webkit/imageanalyzer/imageanalyzer.cpp | 1 | ||||
| -rw-r--r-- | examples/webkit/imageanalyzer/imageanalyzer.pro | 2 | ||||
| -rw-r--r-- | sync.profile | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/examples/browser/cookiejar.cpp b/examples/browser/cookiejar.cpp index d65573d..b25937d 100644 --- a/examples/browser/cookiejar.cpp +++ b/examples/browser/cookiejar.cpp @@ -57,6 +57,7 @@ #include <QtWidgets/QHeaderView> #include <QtGui/QKeyEvent> #include <QtCore/QSortFilterProxyModel> +#include <QtNetwork/QNetworkCookie> #include <QtWebKit/QWebSettings> diff --git a/examples/webkit/imageanalyzer/imageanalyzer.cpp b/examples/webkit/imageanalyzer/imageanalyzer.cpp index 11309e3..6e2b0b4 100644 --- a/examples/webkit/imageanalyzer/imageanalyzer.cpp +++ b/examples/webkit/imageanalyzer/imageanalyzer.cpp @@ -43,6 +43,7 @@ #include <QNetworkRequest> #include <QNetworkAccessManager> #include <QNetworkDiskCache> +#include <QtConcurrentMap> #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/sync.profile b/sync.profile index e1dfeb2..98c4998 100644 --- a/sync.profile +++ b/sync.profile @@ -6,7 +6,7 @@ # %dependencies = ( "qtbase" => "refs/heads/master", - "qtwebkit" => "refs/heads/qt-modularization-base", + "qtwebkit" => "refs/heads/master", "qtscript" => "refs/heads/master", "qtsvg" => "refs/heads/master", "qtxmlpatterns" => "refs/heads/master", |