Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

3 files changed, 15 insertions, 1 deletions

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 63e2891..742f4ec 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -955,6 +955,17 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \macro QT_VERSION_CHECK
+    \relates <QtGlobal>
+
+    Turns the major, minor and patch numbers of a version into an
+    integer, 0xMMNNPP (MM = major, NN = minor, PP = patch). This can 
+    be compared with another similarly processed version id.
+
+    \sa QT_VERSION
+*/
+
+/*!
     \macro QT_VERSION
     \relates <QtGlobal>
 
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 6f0b0ee..b7775bd 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -849,6 +849,9 @@
     getter functions QWidget::isEnabled().  This is set/cleared by the
     Qt kernel.
 
+    \value WA_DontShowOnScreen Indicates that the widget is hidden or is
+    not a part of the viewable Desktop.
+
     \omitvalue WA_DropSiteRegistered
     \omitvalue WA_ForceAcceptDrops
 
diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp
index e73282f..4cccc91 100644
--- a/src/gui/painting/qprintengine_pdf.cpp
+++ b/src/gui/painting/qprintengine_pdf.cpp
@@ -534,7 +534,7 @@ int QPdfEnginePrivate::addImage(const QImage &img, bool *bitmap, qint64 serial_n
 
     QImage image = img;
     QImage::Format format = image.format();
-    if (image.depth() == 1 && *bitmap) {
+    if (image.depth() == 1 && *bitmap && img.colorTable().size() == 0) {
         if (format == QImage::Format_MonoLSB)
             image = image.convertToFormat(QImage::Format_Mono);
         format = QImage::Format_Mono;