Merge branch '4.5' of /home/dboddie/git/qt-45/ into 4.5

2 files changed, 21 insertions, 13 deletions

diff --git a/doc/src/qprintdialog.qdoc b/doc/src/qprintdialog.qdoc
index 6cac1c9..a4cd18b 100644
--- a/doc/src/qprintdialog.qdoc
+++ b/doc/src/qprintdialog.qdoc
@@ -39,26 +39,34 @@
 **
 ****************************************************************************/
 
+#ifdef QT3_SUPPORT
 /*!
-  \fn QPrinter *QPrintDialog::printer() const
+    \fn QPrinter *QPrintDialog::printer() const
 
-  Returns a pointer to the printer this dialog configures, or 0 if
-  this dialog does not operate on any printer.
+    Returns a pointer to the printer this dialog configures, or 0 if
+    this dialog does not operate on any printer.
+
+    This function is available for Unix platforms only.
 */
 
 /*!
-  \fn void QPrintDialog::setPrinter(QPrinter *printer, bool pickupSettings)
+    \fn void QPrintDialog::setPrinter(QPrinter *printer, bool pickupSettings)
+
+    Sets this dialog to configure printer \a printer, or no printer if \a printer
+    is null. If \a pickupSettings is true, the dialog reads most of
+    its settings from \a printer. If \a pickupSettings is false (the
+    default) the dialog keeps its old settings.
 
-  Sets this dialog to configure printer \a printer, or no printer if \a printer
-  is null. If \a pickupSettings is true, the dialog reads most of
-  its settings from \a printer. If \a pickupSettings is false (the
-  default) the dialog keeps its old settings.
+    This function is available for Unix platforms only.
 */
 
 /*!
-  \fn void QPrintDialog::addButton(QPushButton *button)
+    \fn void QPrintDialog::addButton(QPushButton *button)
+
+    Adds the \a button to the layout of the print dialog. The added
+    buttons are arranged from the left to the right below the
+    last groupbox of the printdialog.
 
-  Adds the \a button to the layout of the print dialog. The added
-  buttons are arranged from the left to the right below the
-  last groupbox of the printdialog.
+    This function is available for Unix platforms only.
 */
+#endif
diff --git a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp
index 355a237..783852b 100644
--- a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp
+++ b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp
@@ -33,7 +33,7 @@ MyStruct s2 = var.value<MyStruct>();
 
 //! [3]
 int id = QMetaType::type("MyClass");
-if (id != -1) {
+if (id == 0) {
     void *myClassPtr = QMetaType::construct(id);
     ...
     QMetaType::destroy(id, myClassPtr);