From 15b10bf77dde5235083f383c186e809c16e2e56a Mon Sep 17 00:00:00 2001
From: Andreas Kling <andreas.kling@nokia.com>
Date: Wed, 13 Jan 2010 10:37:10 +0100
Subject: Remove erroneous warning in QFileInfo::absolutePath()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QFileInfo().absolutePath() is legal and shouldn't produce a warning.

Reviewed-by: João Abecasis
---
 src/corelib/io/qfileinfo.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index b4437db..e90529e 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -573,10 +573,13 @@ QString QFileInfo::canonicalFilePath() const
 QString QFileInfo::absolutePath() const
 {
     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);
 }
 
-- 
cgit v0.12