Changeset 769 for trunk/src/gui/image/qnativeimage.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qnativeimage.cpp (modified) (1 diff)

trunk/src/gui/image/qnativeimage.cpp

@@ -202 +202 @@
         ok = (xshminfo.shmaddr != (char*)-1);
         if (ok)
-            image = QImage((uchar *)xshmimg->data, width, height, systemFormat());
+            image = QImage((uchar *)xshmimg->data, width, height, );
     }
     xshminfo.readOnly = false;