Changeset 846 for trunk/src/corelib/io/qresource.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/io/qresource.cpp (modified) (4 diffs)

trunk/src/corelib/io/qresource.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -188 +188 @@
     as a file system rooted with a \c{/} character, or in resource notation
     rooted with a \c{:} character. A relative resource can also be opened
-    which will be found through the searchPaths().
+    which will be found searchPaths().
 
     A QResource that is representing a file will have data backing it, this
@@ -929 +929 @@
 };
 
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX)
 #define QT_USE_MMAP
 #endif
@@ -1412 +1412 @@
         const QString path = (file == AbsolutePathName) ? d->resource.absoluteFilePath() : d->resource.fileName();
         const int slash = path.lastIndexOf(QLatin1Char('/'));
-        if (slash != -1)
-            return path.left(slash);
+        if (slash == -1)
+            return QLatin1String(":");
+        else if (slash <= 1)
+            return QLatin1String(":/");
+        return path.left(slash);
+
     } else if(file == CanonicalName || file == CanonicalPathName) {
         const QString absoluteFilePath = d->resource.absoluteFilePath();