diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-08-13 13:38:45 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-15 01:30:54 +0200 |
| commit | d5ed6936be137fcb59290b591b46a88e12c34dcd (patch) | |
| tree | e5541aea99ecc52913c39f024245dfae1fbe407c /qmake | |
| parent | a8467780fb9f3ac97a05f3acdc07f9cee93a5d23 (diff) | |
We just need one digest algorithm, any algorithm, to generate a
somewhat unique identifier. SHA-1 will suffice.
Change-Id: I3cb26bf866d616df3ef32feace10934f19daa1a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 3 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 2 | ||||
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 1 | ||||
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 6 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 2 | ||||
| -rw-r--r-- | qmake/qmake.pri | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 9b7bfa6f8b..1a50de8004 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -92,7 +92,8 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ -I$(SOURCE_PATH)/tools/shared \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL -DPROEVALUATOR_DEBUG \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS \ - -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM + -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ + -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 CXXFLAGS = $(EXTRA_CXXFLAGS) $(CPPFLAGS) diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 85b5405b41..ac66887b32 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -41,7 +41,7 @@ CFLAGS_BARE = -c -Fo./ \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL -DPROEVALUATOR_DEBUG \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS \ -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DUNICODE + -DUNICODE -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 CFLAGS = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS) $(EXTRA_CPPFLAGS) CXXFLAGS_BARE = $(CFLAGS_BARE) diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index f6bd448cba..8a3a75b7d9 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -44,7 +44,6 @@ #include "meta.h" #include <qdir.h> #include <qregexp.h> -#include <qcryptographichash.h> #include <qdebug.h> #include <stdlib.h> #include <time.h> diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 41e5754251..e634f6976e 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()); } @@ -1545,7 +1545,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]; diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index dfcb0ec352..d550748c9b 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -340,7 +340,7 @@ QUuid VcprojGenerator::getProjectUUID(const QString &filename) // If none, create one based on the MD5 of absolute project path if(uuid.isNull() || !filename.isEmpty()) { QString abspath = Option::fixPathToLocalOS(filename.isEmpty()?project->first("QMAKE_MAKEFILE").toQString():filename); - QByteArray digest = QCryptographicHash::hash(abspath.toUtf8(), QCryptographicHash::Md5); + QByteArray digest = QCryptographicHash::hash(abspath.toUtf8(), QCryptographicHash::Sha1); memcpy((unsigned char*)(&uuid), digest.constData(), sizeof(QUuid)); validUUID = !uuid.isNull(); uuid.data4[0] = (uuid.data4[0] & 0x3F) | 0x80; // UV_DCE variant diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 66f7964c5f..a642f9bae0 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -147,7 +147,7 @@ bootstrap { #Qt code CFLAGS += -fhonor-std LFLAGS += -lcpp } - DEFINES *= QT_NO_QOBJECT + DEFINES *= QT_NO_QOBJECT QT_CRYPTOGRAPHICHASH_ONLY_SHA1 } else { CONFIG += qt QT = core |