diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-07 19:02:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-03 00:37:48 +0200 |
| commit | a84af7425c4dfbb6a55dddcd474613fbe1ec2d2b (patch) | |
| tree | 8a31336c4786e2a296f2e170d7625a86127b5384 /src/tools | |
| parent | 7b92a84f032b2989d83d576d7e709e1919ddb24e (diff) | |
add qcryptographichash to bootstrap lib
needed to make qdoc bootstrapping optional
Change-Id: Ie630d129ed038fd90078197588a6df723eddf553
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 2 | ||||
| -rw-r--r-- | src/tools/qdoc/qdoc.pro | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 8b28b09e00..4819dbdd07 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -25,6 +25,7 @@ MODULE_DEFINES = \ DEFINES += \ $$MODULE_DEFINES \ + QT_CRYPTOGRAPHICHASH_ONLY_SHA1 \ QT_NO_CAST_FROM_ASCII MODULE_PRIVATE_INCLUDES = \ @@ -84,6 +85,7 @@ SOURCES += \ ../../corelib/tools/qbytearray.cpp \ ../../corelib/tools/qarraydata.cpp \ ../../corelib/tools/qbytearraymatcher.cpp \ + ../../corelib/tools/qcryptographichash.cpp \ ../../corelib/tools/qdatetime.cpp \ ../../corelib/tools/qhash.cpp \ ../../corelib/tools/qlist.cpp \ diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index 7664fa4f4d..ebf02b6a14 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -1,8 +1,8 @@ option(host_build) CONFIG += force_bootstrap # because of weird QLibraryInfo::location() reference -DEFINES += QDOC2_COMPAT \ - QT_CRYPTOGRAPHICHASH_ONLY_SHA1 +DEFINES += \ + QDOC2_COMPAT INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \ $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser @@ -66,8 +66,7 @@ SOURCES += atom.cpp \ text.cpp \ tokenizer.cpp \ tree.cpp \ - yyindent.cpp \ - ../../corelib/tools/qcryptographichash.cpp + yyindent.cpp ### QML/JS Parser ### |