From 362a61cd821144141324d99cdbaf1ddd858076d9 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Fri, 7 Jan 2011 16:17:13 +0100
Subject: fix build with QT_NO_BEARERMANAGEMENT
start() is only defined when using bearer management; that method calls
open(), which we just call directly if not using bearer.
Reviewed-by: Markus Goetz
Task-number: QTBUG-16477
---
src/network/access/qnetworkaccessdatabackend.cpp | 4 ++++
1 file changed, 4 insertions(+)
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;
}
--
cgit v0.12
From 55b0db65877ef5cfb6616f11988c990e2c207bd6 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 7 Jan 2011 16:42:16 +0100
Subject: Examples: Fix compilation with namespace.
---
examples/webkit/imageanalyzer/imageanalyzer.h | 6 +++---
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
{
--
cgit v0.12
From eab9b566d8e7cd98dd69cbcfc39393192a9e6efa Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 7 Jan 2011 16:43:46 +0100
Subject: CLucene: Use the right delete operator.
Task-number: QTBUG-15787
Task-number: QTBUG-15788
---
tools/assistant/lib/fulltextsearch/qindexwriter.cpp | 2 +-
tools/assistant/lib/fulltextsearch/qsort.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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)
--
cgit v0.12