Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits)
  Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
  Autotest: add some debugging, just in case there's something wrong
  Autotest: fix the fix for the rounding error.
  Fix compile error with QT_NO_LIBRARY in QtMultimedia
  the _setmode() prototype is different on win ce
  qdoc: Changed qdoc to output the new doc format.
  Doc: update 'developing on mac'
  fcntl.h doesn't seem to exist, either - contrary to an example on msdn
  Autotest: fix paths on the test server after update.
  Force the repaint during a window resize.
  fix compile on wince
  remove CONFIG += ordered again
  Assistant: Check namespace and virtual folder syntax of help projects.
  QtHelp: Fix auto tests.
  Fix a crash when unloading libQtCore
  Introduce a qconfig feature for QtDBus
  Fix build after MR 543 merged.
  Compile on 10.4.
  revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"
  Remove expected failures after JavaScriptCore bug fix
  ...

2 files changed, 11 insertions, 0 deletions

diff --git a/src/multimedia/base/qmediapluginloader.cpp b/src/multimedia/base/qmediapluginloader.cpp
index 24c5aba..eaf6218 100644
--- a/src/multimedia/base/qmediapluginloader.cpp
+++ b/src/multimedia/base/qmediapluginloader.cpp
@@ -98,6 +98,7 @@ void QMediaPluginLoader::load()
             }
         }
     } else {
+#ifndef QT_NO_LIBRARY
         QStringList     paths = QCoreApplication::libraryPaths();
 
         foreach (QString const &path, paths) {
@@ -126,6 +127,7 @@ void QMediaPluginLoader::load()
                 loader.unload();
             }
         }
+#endif
     }
 }
 
diff --git a/src/multimedia/base/qpaintervideosurface_mac.mm b/src/multimedia/base/qpaintervideosurface_mac.mm
index ee03990..1154f86 100644
--- a/src/multimedia/base/qpaintervideosurface_mac.mm
+++ b/src/multimedia/base/qpaintervideosurface_mac.mm
@@ -53,6 +53,7 @@
 
 #include <QuartzCore/CIContext.h>
 #include <CGLCurrent.h>
+#include <gl.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -147,11 +148,19 @@ QAbstractVideoSurface::Error QVideoSurfaceCoreGraphicsPainter::paint(
                         CGContextTranslateCTM(cgContext, 0, dRect.origin.y + CGRectGetMaxY(dRect));
                         CGContextScaleCTM(cgContext, 1, -1);
 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
+    if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_4) {
                         CGContextDrawImage(cgContext, dRect, [bitmap CGImage]);
+    }
+#endif
 
                         CGContextRestoreGState(cgContext);
                     } else {
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
+    if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_4) {
                         CGContextDrawImage(cgContext, dRect, [bitmap CGImage]);
+    }
+#endif
                     }
 
                     [bitmap release];