diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-27 10:22:56 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 10:23:39 +0200 |
commit | af0d0b9c06c18850626e5454b39b45255c3e36cb (patch) | |
tree | 31768765e1195781fba5350ad99e93e926dd083c /qmake/generators/makefiledeps.cpp | |
parent | 8daa050ed2bc3502f19ae38e2c3060941a19a5a6 (diff) | |
parent | 4e196159077a820e99bc8bd306d31d0ccaa17c57 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/ios/ios.pro
src/plugins/platforms/ios/kernel.pro
src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h
src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h
src/plugins/platforms/ios/qiosintegration.h
src/widgets/widgets/qcombobox.cpp
tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45
Diffstat (limited to 'qmake/generators/makefiledeps.cpp')
-rw-r--r-- | qmake/generators/makefiledeps.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index 57cb0ea854..44f715346f 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -46,6 +46,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> +#include <limits.h> #if defined(_MSC_VER) && _MSC_VER >= 1400 #include <share.h> #endif @@ -979,9 +980,11 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file) continue; int matchlen = 0, extralines = 0; + size_t needle_len = strlen(interesting[interest]); + Q_ASSERT(needle_len <= INT_MAX); if (matchWhileUnsplitting(buffer, buffer_len, y, interesting[interest], - strlen(interesting[interest]), + static_cast<int>(needle_len), &matchlen, &extralines) && y + matchlen < buffer_len && !isCWordChar(buffer[y + matchlen])) { |