diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 23:49:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 23:49:48 (GMT) |
| commit | 2707cdd482c975e58a4736ac85c32af45435f561 (patch) | |
| tree | ba81c9b17dfdbfb5ab0b5dbd8d6c836cac1b64c3 /examples | |
| parent | 4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae (diff) | |
| parent | eab9b566d8e7cd98dd69cbcfc39393192a9e6efa (diff) | |
| download | Qt-2707cdd482c975e58a4736ac85c32af45435f561.zip Qt-2707cdd482c975e58a4736ac85c32af45435f561.tar.gz Qt-2707cdd482c975e58a4736ac85c32af45435f561.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
CLucene: Use the right delete operator.
Examples: Fix compilation with namespace.
fix build with QT_NO_BEARERMANAGEMENT
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/webkit/imageanalyzer/imageanalyzer.h | 6 | ||||
| -rw-r--r-- | examples/webkit/imageanalyzer/mainwindow.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.h b/examples/webkit/imageanalyzer/imageanalyzer.h index 1bb25dc..265a0c5 100644 --- a/examples/webkit/imageanalyzer/imageanalyzer.h +++ b/examples/webkit/imageanalyzer/imageanalyzer.h @@ -44,9 +44,9 @@ #include <QFutureWatcher> #include <QtGui> -class QNetworkAccessManager; -class QNetworkReply; -class QNetworkDiskCache; +QT_FORWARD_DECLARE_CLASS(QNetworkAccessManager) +QT_FORWARD_DECLARE_CLASS(QNetworkReply) +QT_FORWARD_DECLARE_CLASS(QNetworkDiskCache) //! [ ImageAnalyzer - public interface ] class ImageAnalyzer : public QObject diff --git a/examples/webkit/imageanalyzer/mainwindow.h b/examples/webkit/imageanalyzer/mainwindow.h index 076e586..dac7c56 100644 --- a/examples/webkit/imageanalyzer/mainwindow.h +++ b/examples/webkit/imageanalyzer/mainwindow.h @@ -45,7 +45,7 @@ #include <QWebView> class ImageAnalyzer; -class QNetworkDiskCache; +QT_FORWARD_DECLARE_CLASS(QNetworkDiskCache) class MainWin : public QWebView { |