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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits)
  Compile fix on Windows.
  Remove an unnecessary assert.
  Documentation for the Pad Navigator Example.
  New Pad Nagivator example implementation.
  Skip definition of wintab functions in case of QT_NO_TABLETEVENT.
  Made curve tesselation be dynamically adjusted based on transform.
  Modified QPainter and QPixmap benchmarks to use raster pixmaps.
  Stabilize tst_QWidgetAction::visibilityUpdate
  Fix compiler warning in QT_REQUIRE_VERSION
  Stabilize tst_QColumnView::parentCurrentIndex
  Really fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
  Fix typos in Elastic Nodes example documentation.
  Made paint engine texture drawing work in GL ES 2 and updated docs.
  Opt out of visual-config size checks with extension
  Fix off-by-one in text layouts and widget size hints on Mac
  Stabilize tst_QDockWidget::taskQTBUG_9758_undockedGeometry
  Mark QFileDialog::Options as a Q_FLAGS
  fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
  Fixed scrolling bugs in widget graphics effect backend.
  Fixed source pixmap bug in widget graphics effect backend.
  ...

1 files changed, 3 insertions, 0 deletions

diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index bb11d6b..223df9b 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -810,6 +810,9 @@ qint64 QIODevice::read(char *data, qint64 maxSize)
                 }
             }
 
+            if (!maxSize)
+                return readSoFar;
+
             if ((d->openMode & Unbuffered) == 0 && maxSize < QIODEVICE_BUFFERSIZE) {
                 // In buffered mode, we try to fill up the QIODevice buffer before
                 // we do anything else.