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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (69 commits)
  runonphone timestamps nanosecond formating set to 9 chars, 0 padded
  Add -nn for .cpp MOC preprocessing for INTEGRITY
  Remove commented out code.
  Update Polish translations for 4.8
  Fixes: libpng symbols exported from QtGui.dll on Windows
  omit unassigned (and too recent codepoints) from the text Normalization process
  purge "Translation Rules for Plurals"
  add -list-languages option to lupdate
  Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
  Ukrainian translation updated
  QHostInfo: fix a race condition under CE
  Do not let QGLContext get out of sync when doing mixed VG-GL rendering
  Build fix for WINCE to qfilesystemengine_win.cpp
  Fixed typo in QSettings documentation.
  Doc updates to "Installing Qt for the Symbian Platform" page.
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication
  Added Qt Quick Components link to document
  remove dead code
  Added text about -random and -seed options in QTest to changelog
  ...

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