Merge in WebKit r47029.

1 files changed, 3 insertions, 3 deletions

diff --git a/WebCore/platform/qt/FileSystemQt.cpp b/WebCore/platform/qt/FileSystemQt.cpp
index a17f3ab..28d3ca7 100644
--- a/WebCore/platform/qt/FileSystemQt.cpp
+++ b/WebCore/platform/qt/FileSystemQt.cpp
@@ -64,7 +64,7 @@ bool getFileSize(const String& path, long long& result)
 {
     QFileInfo info(path);
     result = info.size();
-    return info.exists(); 
+    return info.exists();
 }
 
 bool getFileModificationTime(const String& path, time_t& result)
@@ -96,7 +96,7 @@ String pathGetFileName(const String& path)
 
 String directoryName(const String& path)
 {
-    return String(QFileInfo(path).baseName());
+    return String(QFileInfo(path).absolutePath());
 }
 
 Vector<String> listDirectory(const String& path, const String& filter)
@@ -156,7 +156,7 @@ bool unloadModule(PlatformModule module)
         delete module;
         return true;
     }
-                        
+
     return false;
 #endif
 }