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

5 files changed, 10 insertions, 6 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
 {
diff --git a/src/network/access/qnetworkaccessdatabackend.cpp b/src/network/access/qnetworkaccessdatabackend.cpp
index 74aebdb..d2db2f2 100644
--- a/src/network/access/qnetworkaccessdatabackend.cpp
+++ b/src/network/access/qnetworkaccessdatabackend.cpp
@@ -124,7 +124,11 @@ bool QNetworkAccessDataBackend::waitForUpstreamBytesWritten(int)
 
 bool QNetworkAccessDataBackend::processRequestSynchronously()
 {
+#ifndef QT_NO_BEARERMANAGEMENT
     start();
+#else
+    open();
+#endif
     return true;
 }
 
diff --git a/tools/assistant/lib/fulltextsearch/qindexwriter.cpp b/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
index 357569c..ee1c2dc 100644
--- a/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
+++ b/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
@@ -88,7 +88,7 @@ void QCLuceneIndexWriter::addIndexes(const QList<QCLuceneIndexReader*> &readers)
         readerArray[i] = (readers.at(i))->d->reader;
 
     d->writer->addIndexes(readerArray);
-    delete readerArray; 
+    delete [] readerArray;
 }
 
 void QCLuceneIndexWriter::addDocument(QCLuceneDocument &doc, 
diff --git a/tools/assistant/lib/fulltextsearch/qsort.cpp b/tools/assistant/lib/fulltextsearch/qsort.cpp
index d9375bf..3263195 100644
--- a/tools/assistant/lib/fulltextsearch/qsort.cpp
+++ b/tools/assistant/lib/fulltextsearch/qsort.cpp
@@ -84,7 +84,7 @@ void QCLuceneSort::setSort(const QStringList &fieldNames)
 
     for (int i = 0; i < fieldNames.count(); ++i)
         delete [] nameArray[i];
-    delete nameArray;
+    delete [] nameArray;
 }
 
 void QCLuceneSort::setSort(const QString &field, bool reverse)