Changeset 679 for trunk/src

Timestamp:

Mar 13, 2010, 10:16:00 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QTemporaryFile: FIxed: Files were opened in O_TEXT mode which caused unexpected LF <-> CRLF translation. In particular, this broke QNetworkDiskCache functionality (seen in e.g. demos/browser as missing images and CSS sheets when read from cache).

File:

• trunk/src/corelib/io/qtemporaryfile.cpp (modified) (3 diffs)

trunk/src/corelib/io/qtemporaryfile.cpp

@@ -174 +174 @@
             if (*trv == '/') {
                 *trv = '\0';
-#if defined (Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if (defined (Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined (Q_OS_OS2)
                 if (trv - path == 2 && path[1] == ':') {
                     // Special case for Windows drives
@@ -217 +217 @@
                 QT_OPEN(targetPath.toLocal8Bit(), O_CREAT|O_EXCL|O_RDWR
 #  else // CE
-            // this is Unix or older MSVC
+            // this is Unix or older MSVC or OS/2
             if ((*doopen =
                 QT_OPEN(path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR
@@ -226 +226 @@
 #  if defined(Q_OS_WINCE)
                            |_O_BINARY
-#  elif defined(Q_OS_WIN)
+#  elif defined(Q_OS_WIN) || defined (Q_OS_OS2)
                            |O_BINARY
 #  endif