summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2011-09-03 14:20:46 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-09-06 13:30:26 (GMT)
commita5211c5c259f2741bf1f3f9dabf6587516eee052 (patch)
treeddf9a88ed82130eb19b9cd136ca3b6b277002b5e /examples
parent02f55668dada4a23ab84e4d3bda1df8a4984b3ae (diff)
downloadQt-a5211c5c259f2741bf1f3f9dabf6587516eee052.zip
Qt-a5211c5c259f2741bf1f3f9dabf6587516eee052.tar.gz
Qt-a5211c5c259f2741bf1f3f9dabf6587516eee052.tar.bz2
Fix the build with -qtnamespace configure options
Merge-Request: 1291 Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/opengl/cube/mainwidget.h2
-rw-r--r--examples/webkit/simplewebplugin/csvfactory.h6
-rw-r--r--examples/webkit/webftpclient/ftpreply.h4
-rw-r--r--examples/webkit/webftpclient/ftpview.h3
-rw-r--r--examples/widgets/orientation/mainwindow.h6
5 files changed, 19 insertions, 2 deletions
diff --git a/examples/opengl/cube/mainwidget.h b/examples/opengl/cube/mainwidget.h
index c6da29f..eb509d0 100644
--- a/examples/opengl/cube/mainwidget.h
+++ b/examples/opengl/cube/mainwidget.h
@@ -48,8 +48,10 @@
#include <QQuaternion>
#include <QVector2D>
+QT_BEGIN_NAMESPACE
class QBasicTimer;
class QGLShaderProgram;
+QT_END_NAMESPACE
class GeometryEngine;
diff --git a/examples/webkit/simplewebplugin/csvfactory.h b/examples/webkit/simplewebplugin/csvfactory.h
index e3013b1..0168dc2 100644
--- a/examples/webkit/simplewebplugin/csvfactory.h
+++ b/examples/webkit/simplewebplugin/csvfactory.h
@@ -44,10 +44,10 @@
#include <QNetworkRequest>
#include <QWebPluginFactory>
-QT_BEGIN_NAMESPACE
class QNetworkAccessManager;
class QNetworkReply;
-QT_END_NAMESPACE
+
+QT_BEGIN_NAMESPACE
//! [plugin factory]
class CSVFactory : public QWebPluginFactory
@@ -66,4 +66,6 @@ private:
};
//! [plugin factory]
+QT_END_NAMESPACE
+
#endif
diff --git a/examples/webkit/webftpclient/ftpreply.h b/examples/webkit/webftpclient/ftpreply.h
index ca0a271..65c8c66 100644
--- a/examples/webkit/webftpclient/ftpreply.h
+++ b/examples/webkit/webftpclient/ftpreply.h
@@ -46,6 +46,10 @@
#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 544c0a9..ae4f9c1 100644
--- a/examples/webkit/webftpclient/ftpview.h
+++ b/examples/webkit/webftpclient/ftpview.h
@@ -41,6 +41,9 @@
#include <QWebView>
class Downloader;
+QT_BEGIN_NAMESPACE
+class QNetworkAccessManager;
+QT_END_NAMESPACE
class FtpView : public QWebView
{
diff --git a/examples/widgets/orientation/mainwindow.h b/examples/widgets/orientation/mainwindow.h
index 745497c..29ccf06 100644
--- a/examples/widgets/orientation/mainwindow.h
+++ b/examples/widgets/orientation/mainwindow.h
@@ -46,6 +46,10 @@
#include "ui_landscape.h"
#include "ui_portrait.h"
+class QAbstractButton;
+
+QT_BEGIN_NAMESPACE
+
//! [0]
class MainWindow : public QWidget
{
@@ -68,4 +72,6 @@ private:
};
//! [0]
+QT_END_NAMESPACE
+
#endif // MAINWINDOW_H