Changeset 651 for trunk/src/corelib/io/qfileinfo.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/io/qfileinfo.cpp (modified) (2 diffs)

trunk/src/corelib/io/qfileinfo.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -584 +584 @@
 {
     Q_D(const QFileInfo);
-    if (d->data->fileName.isEmpty())
+
+    if (!d->data->fileEngine) {
+        return QLatin1String("");
+    } else if (d->data->fileName.isEmpty()) {
         qWarning("QFileInfo::absolutePath: Constructed with empty filename");
-    if(!d->data->fileEngine)
-        return QLatin1String("");
+    
+    
     return d->getFileName(QAbstractFileEngine::AbsolutePathName);
 }