--- a/qtmobility/src/versit/qversitresourcehandler.cpp	Wed Jun 23 19:08:38 2010 +0300
+++ b/qtmobility/src/versit/qversitresourcehandler.cpp	Tue Jul 06 15:12:50 2010 +0300
@@ -41,7 +41,6 @@
 
 #include "qversitresourcehandler.h"
 #include "qversitproperty.h"
-#include "qversitdefaultresourcehandler_p.h"
 #include "qversitdefs_p.h"
 #include <QFile>
 
@@ -94,6 +93,14 @@
   \sa QVersitContactImporter, QVersitContactExporter, QVersitResourceHandler
  */
 
+
+QTM_BEGIN_NAMESPACE
+class QVersitDefaultResourceHandlerPrivate {
+public:
+    QMap<QString,QString> mFileExtensionMapping;
+};
+QTM_END_NAMESPACE
+
 /*!
   Constructs a QVersitDefaultResourceHandler.
  */
@@ -131,7 +138,8 @@
     if (location.isEmpty())
         return false;
     QFile file(location);
-    file.open(QIODevice::ReadOnly);
+    if (!file.open(QIODevice::ReadOnly))
+        return false;
     if (!file.isReadable())
         return false;
     *contents = file.readAll();