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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (110 commits)
  Doc: adding link to the Qt Quick Components for Symbian page.
  Update Japanese translations.
  Updated Russian translation
  Update Korean translations to 4.8
  qmake: fix writing of incremental linker option for vcxproj files
  support the obj-c #import statement in the dependency generator
  runonphone timestamps nanosecond formating set to 9 chars, 0 padded
  Put Qt translation files to rom on Symbian.
  Add -nn for .cpp MOC preprocessing for INTEGRITY
  Remove commented out code.
  Update Polish translations for 4.8
  Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian
  Fixes: libpng symbols exported from QtGui.dll on Windows
  Converting from double to qreal in gui
  Doc updates to installation, platform notes and symbian introduction.
  Fix XML schema validation failure.
  omit unassigned (and too recent codepoints) from the text Normalization process
  purge "Translation Rules for Plurals"
  add -list-languages option to lupdate
  Fix construction races in QtNetwork
  ...

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