Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  add integrity gbuild to the project file for convenience
  don't build activeqt examples on mingw
  QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
  Updated Russian translation
  Ukrainian translation updated for 4.8
  retreving -> retrieving
  Removed duplicate Spectrum Analyzer entry from demos doc page.
  Removed obsolete QWS_ALPHA_CURSOR feature.
  Removed duplicate link from QFinalState documentation.
  Clarified keypad navigation specific event documentation.
  docs: Typo and link fixes.
  Use the right callback in QObject::disconnect()

3 files changed, 5 insertions, 12 deletions

diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 5c0652c..201b5c7 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -149,13 +149,6 @@
        implement a small Web browser.
     \endlist
 
-    \section1 Multimedia
-
-    \list
-    \o \l{demos/spectrum}{Spectrum Analyser} shows how the \l{QtMultimedia}
-       module can be used to manipulate audio as it is played.
-    \endlist
-
     \section1 Phonon
 
     \list
diff --git a/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp b/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp
index fd5f386..a5f3ed1 100644
--- a/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp
+++ b/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp
@@ -44,7 +44,7 @@ class MyDaemon : public QObject
     Q_OBJECT
 
   public:
-    MyDaemon(QObject *parent = 0, const char *name = 0);
+    MyDaemon(QObject *parent = 0);
     ~MyDaemon();
 
     // Unix signal handlers.
@@ -67,8 +67,8 @@ class MyDaemon : public QObject
 
 
 //! [1]
-MyDaemon::MyDaemon(QObject *parent, const char *name)
-    	 : QObject(parent,name)
+MyDaemon::MyDaemon(QObject *parent)
+        : QObject(parent)
 {
     if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sighupFd))
        qFatal("Couldn't create HUP socketpair");
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
index 11f5163..e695572 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
@@ -76,7 +76,7 @@ QString result = future.result();
 //! [4]
 // call 'QList<QByteArray>  QByteArray::split(char sep) const' in a separate thread
 QByteArray bytearray = "hello world";
-QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split), ',');
+QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split, ',');
 ...
 QList<QByteArray> result = future.result();
 //! [4]
@@ -84,7 +84,7 @@ QList<QByteArray> result = future.result();
 //! [5]
 // call 'void QImage::invertPixels(InvertMode mode)' in a separate thread
 QImage image = ...;
-QFuture<void> future = QtConcurrent::run(image, &QImage::invertPixels, QImage::InvertRgba);
+QFuture<void> future = QtConcurrent::run(&image, &QImage::invertPixels, QImage::InvertRgba);
 ...
 future.waitForFinished();
 // At this point, the pixels in 'image' have been inverted