Changeset 14163 for trunk/qt/favicon.cc

Timestamp:

Aug 17, 2013, 4:22:56 PM (9 years ago)

Author:

jordan

Message:

(trunk, qt) #5465: restore Qt 4.6 support, patch by mike.did

File:

• trunk/qt/favicon.cc (modified) (2 diffs)

trunk/qt/favicon.cc

@@ -15 +15 @@
 #include <QNetworkReply>
 #include <QNetworkRequest>
-#include <QStandardPaths>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QDesktopServices>
+#else
+ #include <QStandardPaths>
+#endif
 
 #include "favicon.h"
@@ -41 +46 @@
 Favicons :: getCacheDir( )
 {
-    const QString base = QStandardPaths::writableLocation (QStandardPaths::CacheLocation);
+    const QString base =
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+        QDesktopServices::storageLocation( QDesktopServices::CacheLocation );
+#else
+        QStandardPaths::writableLocation( QStandardPaths::CacheLocation );
+#endif
+
     return QDir( base ).absoluteFilePath( "favicons" );
 }