summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2018-11-02 12:40:26 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2019-08-14 15:03:14 +0200
commit3d56572fe7c5111aa984e358d3c9a8c41ae87e56 (patch)
treef4047e98ca0c3b19f29138d15173925d0696b7ea
parent4bab72368f84840134bebcb1f19fb7c8299ef7ba (diff)
Include buildAbi() in the shader cache directory name
Task-number: QTBUG-64697 Change-Id: I8b81bce94c50464105a9a43086b06b841e4b8551 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/gui/opengl/qopenglprogrambinarycache.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
index 7029cd5455..af48cdacc7 100644
--- a/src/gui/opengl/qopenglprogrambinarycache.cpp
+++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
@@ -40,6 +40,7 @@
#include "qopenglprogrambinarycache_p.h"
#include <QOpenGLContext>
#include <QOpenGLExtraFunctions>
+#include <QSysInfo>
#include <QStandardPaths>
#include <QDir>
#include <QSaveFile>
@@ -102,7 +103,7 @@ static inline bool qt_ensureWritableDir(const QString &name)
QOpenGLProgramBinaryCache::QOpenGLProgramBinaryCache()
: m_cacheWritable(false)
{
- const QString subPath = QLatin1String("/qtshadercache/");
+ const QString subPath = QLatin1String("/qtshadercache-") + QSysInfo::buildAbi() + QLatin1Char('/');
const QString sharedCachePath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
if (!sharedCachePath.isEmpty()) {
m_cacheDir = sharedCachePath + subPath;