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: (71 commits)
  Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation
  Autotest: update to the new values for the locale
  do not expand variables in read()'s file name
  remove ability to use break() a block outside any loop
  don't add -unix to the qmake command line
  Increase the timeout for the QNAM getter test to 30 seconds
  Remove unstable hosts from the list
  qdoc: Output TOC for more class ref pages.
  Other fixes to the remote network stresstester
  Fix SSL connection problem.
  Make sure we don't try URLs that aren't HTTP or HTTPS
  Fix menu bar visibility.
  Add SSL remote host tests
  Split the remote and the local tests in two, in preparation for SSL tests
  Add tests for remote hosts
  Change the way we calculate the average transfer rates.
  Finish renaming
  Move these tests to tests/manual.
  Add a QNetworkAccessManager stresstest
  Add a non-blocking native function too
  ...

3 files changed, 8 insertions, 1 deletions

diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp
index cd6718d..3a4c94c 100644
--- a/src/gui/painting/qpaintbuffer.cpp
+++ b/src/gui/painting/qpaintbuffer.cpp
@@ -312,6 +312,7 @@ int QPaintBuffer::processCommands(QPainter *painter, int begin, int end) const
     return depth;
 }
 
+#ifndef QT_NO_DEBUG_STREAM
 QString QPaintBuffer::commandDescription(int command) const
 {
     QString desc;
@@ -563,6 +564,7 @@ QString QPaintBuffer::commandDescription(int command) const
 
     return desc;
 }
+#endif
 
 QRectF QPaintBuffer::boundingRect() const
 {
diff --git a/src/gui/painting/qpaintbuffer_p.h b/src/gui/painting/qpaintbuffer_p.h
index 4576947..e4fe4bf 100644
--- a/src/gui/painting/qpaintbuffer_p.h
+++ b/src/gui/painting/qpaintbuffer_p.h
@@ -82,7 +82,9 @@ public:
     int frameStartIndex(int frame) const;
     int frameEndIndex(int frame) const;
     int processCommands(QPainter *painter, int begin, int end) const;
+#ifndef QT_NO_DEBUG_STREAM
     QString commandDescription(int command) const;
+#endif
 
     void setBoundingRect(const QRectF &rect);
     QRectF boundingRect() const;
diff --git a/src/gui/painting/qprintengine_mac.mm b/src/gui/painting/qprintengine_mac.mm
index 3d5d1d5..a548225 100644
--- a/src/gui/painting/qprintengine_mac.mm
+++ b/src/gui/painting/qprintengine_mac.mm
@@ -114,8 +114,11 @@ bool QMacPrintEngine::end()
     Q_D(QMacPrintEngine);
     if (d->state == QPrinter::Aborted)
         return true;  // I was just here a function call ago :)
-    if(d->paintEngine->type() == QPaintEngine::CoreGraphics)
+    if(d->paintEngine->type() == QPaintEngine::CoreGraphics) {
+        // We dont need the paint engine to call restoreGraphicsState()
+        static_cast<QCoreGraphicsPaintEngine*>(d->paintEngine)->d_func()->stackCount = 0;
         static_cast<QCoreGraphicsPaintEngine*>(d->paintEngine)->d_func()->hd = 0;
+    }
     d->paintEngine->end();
     if (d->state != QPrinter::Idle)
 	d->releaseSession();