Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (484 commits)
  Updated WebKit to 0eee8df53d1873669a9dda8f9c0340543258a316
  Reformat whitespace according to coding style
  QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets.
  QGraphicsProxyWidget: Fixes QComboBox popup closing issue.
  Crash while changing the windows flags from a Qt::Drawer window on Cocoa
  Fix invalid bookmark in anomaly demo
  Fixed pre-built resources deployment in Symbian
  Fix build failure on Symbian^3.
  warn about stray meta data
  don't complain multiple times about same abuse of //% meta strings
  fix double percent sign after migration to yyMsg()
  Fixed deployment paths for WebKit declarative plugin.
  Fix s60main linking issue with gcce applications
  Fixed deployment paths for the symbian/linux-armcc mkspec.
  Fixed a relative path problem in qml demos.
  Added the APP_PRIVATE_DIR_BASE variable.
  Various fixes to autotests when using the symbian/linux-armcc mkspec.
  Fixed Symbian resources not honoring TARGET with a path.
  Improved QCommandLinkButton's vertical spacing
  syncqt: abort on permission error writing to include/Qt
  ...

1 files changed, 2 insertions, 4 deletions

diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
index 6bebefc0fa..e8dc5aeae0 100644
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
@@ -1250,10 +1250,8 @@ void QX11PixmapData::release()
     pengine = 0;
 
     if (!X11) {
-#ifndef QT_NO_DEBUG
-        qWarning("~QX11PixmapData(): QPixmap objects must be destroyed before the QApplication"
-                 " object, otherwise the native pixmap object will be leaked.");
-#endif
+        // At this point, the X server will already have freed our resources,
+        // so there is nothing to do.
         return;
     }