Merge tag 'upstream/2.3'

[minitube] / src / temporary.cpp

diff --git a/src/temporary.cpp b/src/temporary.cpp
index 3f29d70acc2a230675258c9f8d668c20a60102e4..40bd5427efcd481659665ac4573f31fc4f35ff05 100644 (file)
--- a/src/temporary.cpp
+++ b/src/temporary.cpp
@@ -22,19 +22,22 @@ $END_LICENSE */
 #include "constants.h"
 
 static QList<QString> paths;
-#ifdef Q_WS_X11
+#ifdef Q_OS_LINUX
 static QString userName;
 #endif
 
 Temporary::Temporary() { }
 
 QString Temporary::filename() {
-
+#if QT_VERSION >= 0x050000
+    static const QString tempDir = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
+#else
     static const QString tempDir = QDesktopServices::storageLocation(QDesktopServices::TempLocation);
+#endif
 
     QString tempFile = tempDir + "/" + Constants::UNIX_NAME + "-" + QString::number(qrand());
 
-#ifdef Q_WS_X11
+#ifdef Q_OS_LINUX
     if (userName.isNull()) {
         userName = QString(getenv("USERNAME"));
         if (userName.isEmpty())