diff options
| author | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-09-21 11:45:02 (GMT) |
|---|---|---|
| committer | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-09-21 11:45:02 (GMT) |
| commit | 160b82950ec53d3a0392df0fd18ac6856bfecbcf (patch) | |
| tree | 1bdae6efe3fbcb7f25e0ce91884f83e1cdf68189 /examples/webkit | |
| parent | 8ba781b01e900148fec2e9d26485369b3295487f (diff) | |
| parent | 085bd7cf2d76f9acd548120f859201b014970a72 (diff) | |
| download | Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.zip Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.gz Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.bz2 | |
Merge branch '4.8' into earth-staging-master
Conflicts:
dist/changes-4.8.0
Diffstat (limited to 'examples/webkit')
| -rw-r--r-- | examples/webkit/simplewebplugin/csvfactory.h | 4 | ||||
| -rw-r--r-- | examples/webkit/simplewebplugin/csvview.h | 2 | ||||
| -rw-r--r-- | examples/webkit/webftpclient/downloader.h | 2 | ||||
| -rw-r--r-- | examples/webkit/webftpclient/ftpreply.h | 3 | ||||
| -rw-r--r-- | examples/webkit/webftpclient/ftpview.h | 2 | ||||
| -rw-r--r-- | examples/webkit/webplugin/csvfactory.h | 2 | ||||
| -rw-r--r-- | examples/webkit/webplugin/csvview.h | 2 |
7 files changed, 17 insertions, 0 deletions
diff --git a/examples/webkit/simplewebplugin/csvfactory.h b/examples/webkit/simplewebplugin/csvfactory.h index 0b046c5..0168dc2 100644 --- a/examples/webkit/simplewebplugin/csvfactory.h +++ b/examples/webkit/simplewebplugin/csvfactory.h @@ -47,6 +47,8 @@ class QNetworkAccessManager; class QNetworkReply; +QT_BEGIN_NAMESPACE + //! [plugin factory] class CSVFactory : public QWebPluginFactory { @@ -64,4 +66,6 @@ private: }; //! [plugin factory] +QT_END_NAMESPACE + #endif diff --git a/examples/webkit/simplewebplugin/csvview.h b/examples/webkit/simplewebplugin/csvview.h index 0a136f3..f457d0a 100644 --- a/examples/webkit/simplewebplugin/csvview.h +++ b/examples/webkit/simplewebplugin/csvview.h @@ -46,8 +46,10 @@ #include <QTableView> #include <QWebPluginFactory> +QT_BEGIN_NAMESPACE class QNetworkAccessManager; class QNetworkReply; +QT_END_NAMESPACE //! [definition] class CSVView : public QTableView diff --git a/examples/webkit/webftpclient/downloader.h b/examples/webkit/webftpclient/downloader.h index 8201cea..dd2f8ec 100644 --- a/examples/webkit/webftpclient/downloader.h +++ b/examples/webkit/webftpclient/downloader.h @@ -46,10 +46,12 @@ #include <QObject> #include <QUrl> +QT_BEGIN_NAMESPACE class QNetworkAccessManager; class QNetworkRequest; class QNetworkReply; class QWidget; +QT_END_NAMESPACE class Downloader : public QObject { diff --git a/examples/webkit/webftpclient/ftpreply.h b/examples/webkit/webftpclient/ftpreply.h index becd4e4..65c8c66 100644 --- a/examples/webkit/webftpclient/ftpreply.h +++ b/examples/webkit/webftpclient/ftpreply.h @@ -44,8 +44,11 @@ #include <QNetworkReply> #include <QStringList> #include <QUrlInfo> +#include <QFtp> +QT_BEGIN_NAMESPACE class QFtp; +QT_END_NAMESPACE //! [class definition] class FtpReply : public QNetworkReply diff --git a/examples/webkit/webftpclient/ftpview.h b/examples/webkit/webftpclient/ftpview.h index 2538812..ae4f9c1 100644 --- a/examples/webkit/webftpclient/ftpview.h +++ b/examples/webkit/webftpclient/ftpview.h @@ -41,7 +41,9 @@ #include <QWebView> class Downloader; +QT_BEGIN_NAMESPACE class QNetworkAccessManager; +QT_END_NAMESPACE class FtpView : public QWebView { diff --git a/examples/webkit/webplugin/csvfactory.h b/examples/webkit/webplugin/csvfactory.h index 5a44c50..d1d6b9c 100644 --- a/examples/webkit/webplugin/csvfactory.h +++ b/examples/webkit/webplugin/csvfactory.h @@ -44,8 +44,10 @@ #include <QNetworkRequest> #include <QWebPluginFactory> +QT_BEGIN_NAMESPACE class QNetworkAccessManager; class QNetworkReply; +QT_END_NAMESPACE class QWebView; class CSVFactory : public QWebPluginFactory diff --git a/examples/webkit/webplugin/csvview.h b/examples/webkit/webplugin/csvview.h index bf8918b..4cbb069 100644 --- a/examples/webkit/webplugin/csvview.h +++ b/examples/webkit/webplugin/csvview.h @@ -46,8 +46,10 @@ #include <QTableView> #include <QWebPluginFactory> +QT_BEGIN_NAMESPACE class QNetworkAccessManager; class QNetworkReply; +QT_END_NAMESPACE class QWebFrame; //! [definition] |