Helpviewer/Download/DownloadItem.py

changeset 3778
0c5bc18da740
parent 3664
78e522719af3
child 3788
195dd519bf29
diff -r 0c47cbb5b199 -r 0c5bc18da740 Helpviewer/Download/DownloadItem.py
--- a/Helpviewer/Download/DownloadItem.py	Mon Sep 08 20:13:54 2014 +0200
+++ b/Helpviewer/Download/DownloadItem.py	Sat Sep 13 16:13:52 2014 +0200
@@ -14,7 +14,7 @@
     pass
 
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QFile, QFileInfo, \
-    QUrl, QIODevice, QCryptographicHash, QStandardPaths
+    QUrl, QIODevice, QCryptographicHash, PYQT_VERSION_STR
 from PyQt5.QtGui import QPalette, QDesktopServices
 from PyQt5.QtWidgets import QWidget, QStyle, QDialog
 from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
@@ -210,9 +210,16 @@
                 return
             
             self.__autoOpen = dlg.getAction() == "open"
-            fileName = QStandardPaths.storageLocation(
-                QStandardPaths.TempLocation) + \
-                '/' + QFileInfo(fileName).completeBaseName()
+            if PYQT_VERSION_STR >= "5.0.0":
+                from PyQt5.QtCore import QStandardPaths
+                tempLocation = QStandardPaths.storageLocation(
+                    QStandardPaths.TempLocation)
+            else:
+                from PyQt5.QtGui import QDesktopServices
+                tempLocation = QDesktopServices.storageLocation(
+                    QDesktopServices.TempLocation)
+            fileName = tempLocation + '/' + \
+                QFileInfo(fileName).completeBaseName()
         
         if ask and not self.__autoOpen and self.__requestFilename:
             self.__gettingFileName = True

eric ide

mercurial