From 995ba6f036c333422df3dc20dfe616380fee1dd0 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Tue, 4 Apr 2017 11:22:30 +0200 Subject: Fix warning for -no-feature-temporaryfile Change-Id: Iaa4138610834f87b2a9379e707025d2e8a0fd59c Reviewed-by: Simon Hausmann Reviewed-by: Tasuku Suzuki --- src/qml/compiler/qv4compileddata.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/qml/compiler/qv4compileddata.cpp') diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp index f1f0ec282c..77d61032f7 100644 --- a/src/qml/compiler/qv4compileddata.cpp +++ b/src/qml/compiler/qv4compileddata.cpp @@ -454,6 +454,7 @@ bool CompilationUnit::saveToDisk(const QUrl &unitUrl, QString *errorString) return true; #else + Q_UNUSED(outputFileName) *errorString = QStringLiteral("features.temporaryfile is disabled."); return false; #endif // QT_CONFIG(temporaryfile) -- cgit v1.2.3 From 7cb4d0234587c295c4eb24f5e548799f3364d94d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 7 Apr 2017 12:29:53 +0200 Subject: Speed up Qml library checksumming in developer builds The use of sha1 to determine if there were any changes in the Qml library in developer builds (for cache invalidation) works well, but it results in timeouts when running tests on ARM as type compilation takes too long. This is a developer feature and we might as well use a faster hash such as Md5 that is sufficiently reliable for our purposes. Change-Id: I917ae619c73a9cc821d888f16bfcccafeb8ebacc Reviewed-by: Erik Verbruggen --- src/qml/compiler/qv4compileddata.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/compiler/qv4compileddata.cpp') diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp index 77d61032f7..71546cc22e 100644 --- a/src/qml/compiler/qv4compileddata.cpp +++ b/src/qml/compiler/qv4compileddata.cpp @@ -739,7 +739,7 @@ static QByteArray ownLibraryChecksum() if (dladdr(reinterpret_cast(&ownLibraryChecksum), &libInfo) != 0) { QFile library(QFile::decodeName(libInfo.dli_fname)); if (library.open(QIODevice::ReadOnly)) { - QCryptographicHash hash(QCryptographicHash::Sha1); + QCryptographicHash hash(QCryptographicHash::Md5); hash.addData(&library); libraryChecksum = hash.result(); } -- cgit v1.2.3