diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 10:38:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 11:03:18 +0200 |
| commit | c8ca300e491c186304d0864a9e870337e891e6f7 (patch) | |
| tree | f1d991c5960b5acc0bf2a709960e871d48d91acf /qmake/generators/mac/pbuilder_pbx.cpp | |
| parent | 31c96d34d27f8cad020238df28c10a71b2c4a34f (diff) | |
| parent | 8b540f68a8404e4b9e3ac65a22c11416a91ee749 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/src.pro
Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
Diffstat (limited to 'qmake/generators/mac/pbuilder_pbx.cpp')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index d1c70900fb..b8e6d05728 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -66,9 +66,9 @@ QT_BEGIN_NAMESPACE using namespace QMakeInternal; -static QString qtMD5(const QByteArray &src) +static QString qtSha1(const QByteArray &src) { - QByteArray digest = QCryptographicHash::hash(src, QCryptographicHash::Md5); + QByteArray digest = QCryptographicHash::hash(src, QCryptographicHash::Sha1); return QString::fromLatin1(digest.toHex()); } @@ -1547,7 +1547,7 @@ ProjectBuilderMakefileGenerator::keyFor(const QString &block) #endif QString ret; if(!keys.contains(block)) { - ret = qtMD5(block.toUtf8()).left(24).toUpper(); + ret = qtSha1(block.toUtf8()).left(24).toUpper(); keys.insert(block, ret); } else { ret = keys[block]; |