feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: SharedMemory key needs to be the same with all Qts

Browse Source 
Change-Id: I7b514e3d21f0874fec35331e7fd73c209e9b30d7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Tim Jenssen
2014-08-01 11:13:13 +02:00
committed by Christian Stenger
parent 2bfd14dbf8
commit 186f82a730
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
+2 -6
View File
@@ -102,17 +102,13 @@ static QByteArray makePlatformSafeKey(const QString &key)
{
if (key.isEmpty())
return QByteArray();
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
QByteArray data(QCryptographicHash::hash(key.toLatin1(), QCryptographicHash::Sha1).toBase64());
QString ambiguousChars(QStringLiteral("[=~<>|?*!@#$%^&:,; \\\\]"));
QString notBase64UrlChars(QStringLiteral("[=+/]"));
QByteArray normalizedData;
normalizedData = QString(data).replace(QRegExp(ambiguousChars), QStringLiteral("_")).toLatin1();
normalizedData = QString(data).replace(QRegExp(notBase64UrlChars), QStringLiteral("_")).toLatin1();
return normalizedData;
#else
return QCryptographicHash::hash(key.toLatin1(), QCryptographicHash::Sha1).toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
#endif
}