Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (25 commits)
  Added Qt Quick Components link to document
  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
  QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs
  Ukrainian translation updated for 4.8
  retreving -> retrieving
  Fix assert
  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()
  Compile fix for Symbian
  Debugger: Fix autotest breakage
  Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*
  Rename QDeclarativeEngineDebugServer to ~Service
  Fix aliasing bug when compiled with gcc 4.6
  ...

1 files changed, 3 insertions, 3 deletions

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");