Import 0.4.3 version in mainstream branch

[keepassx] / src / lib / FileDialogs.cpp

diff --git a/src/lib/FileDialogs.cpp b/src/lib/FileDialogs.cpp
index 8405f97..463df1b 100644 (file)
--- a/src/lib/FileDialogs.cpp
+++ b/src/lib/FileDialogs.cpp
@@ -18,6 +18,9 @@
  ***************************************************************************/
 
 #include <QFileDialog>
+#if QT_VERSION >= 0x040400
+       #include <QDesktopServices>
+#endif
 
 IFileDialog* KpxFileDialogs::iFileDialog=NULL;
 QtStandardFileDialogs DefaultQtDlgs;
@@ -146,8 +149,13 @@ int QtStandardFileDialogs::getLastFilter(){
 
 QString FileDlgHistory::getDir(const QString& name){
        Entry e=History.value(name);
-       if(e.isNull())
+       if(e.isNull()) {
+#if QT_VERSION >= 0x040400
+               return QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+#else
                return QDir::homePath();
+#endif
+       }
        else
                return e.Dir;
 }