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

2 files changed, 8 insertions, 8 deletions

diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index 86934bc..6d86b22 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -62,7 +62,7 @@
     Finally, assuming you are using \c qmake to generate your
     makefiles, add this line to your \c myapp.pro file:
 
-    \snippet doc/src/snippets/code/doc_src_appicon.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_appicon.pro 1
 
     Regenerate your makefile and your application. The \c .exe file
     will now be represented with your icon in Explorer.
@@ -96,7 +96,7 @@
     if the name of your icon file is \c{myapp.icns}, and your project
     file is \c{myapp.pro}, add this line to \c{myapp.pro}:
 
-    \snippet doc/src/snippets/code/doc_src_appicon.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_appicon.pro 2
 
     This will ensure that \c qmake puts your icons in the proper
     place and creates an \c{Info.plist} entry for the icon.
@@ -213,6 +213,6 @@
     icon file is \c{myapp.svg}, and your project file is \c{myapp.pro},
     add this line to \c{myapp.pro}:
 
-    \snippet doc/src/snippets/code/doc_src_appicon.qdoc 5
+    \snippet doc/src/snippets/code/doc_src_appicon.pro 5
     
 */
diff --git a/doc/src/howtos/unix-signal-handlers.qdoc b/doc/src/howtos/unix-signal-handlers.qdoc
index 2fa558e..20beb38 100644
--- a/doc/src/howtos/unix-signal-handlers.qdoc
+++ b/doc/src/howtos/unix-signal-handlers.qdoc
@@ -59,7 +59,7 @@
     sigaction(2) man pages before plowing through the following code
     snippets.
     
-    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.cpp 0
 
     In the MyDaemon constructor, use the socketpair(2) function to
     initialize each file descriptor pair, and then create the
@@ -68,24 +68,24 @@
     appropriate slot function, which effectively converts the Unix
     signal to the QSocketNotifier::activated() signal.
 
-    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.cpp 1
 
     Somewhere else in your startup code, you install your Unix signal
     handlers with sigaction(2).
 
-    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.cpp 2
 
     In your Unix signal handlers, you write a byte to the \e write end
     of a socket pair and return. This will cause the corresponding
     QSocketNotifier to emit its activated() signal, which will in turn
     cause the appropriate Qt slot function to run.
 
-    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 3
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.cpp 3
 
     In the slot functions connected to the
     QSocketNotifier::activated() signals, you \e read the byte. Now
     you are safely back in Qt with your signal, and you can do all the
     Qt stuff you weren'tr allowed to do in the Unix signal handler.
 
-    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 4
+    \snippet doc/src/snippets/code/doc_src_unix-signal-handlers.cpp 4
 */