diff options
Diffstat (limited to 'src/qml/common')
-rw-r--r-- | src/qml/common/common.pri | 6 | ||||
-rw-r--r-- | src/qml/common/qqmljsfixedpoolarray_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/common/common.pri b/src/qml/common/common.pri index b333c0f6d9..b824812d27 100644 --- a/src/qml/common/common.pri +++ b/src/qml/common/common.pri @@ -1,8 +1,8 @@ !build_pass { # Create a header containing a hash that describes this library. For a # released version of Qt, we'll use the .tag file that is updated by git - # archive with the commit hash. For unreleased versions, we'll ask git - # describe. Note that it won't update unless qmake is run again, even if + # archive with the tree hash. For unreleased versions, we'll ask git + # rev-parse. Note that it won't update unless qmake is run again, even if # the commit change also changed something in this library. tagFile = $$PWD/../../.tag tag = @@ -10,7 +10,7 @@ tag = $$cat($$tagFile, singleline) QMAKE_INTERNAL_INCLUDED_FILES += $$tagFile } - !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") { + !equals(tag, "$${LITERAL_DOLLAR}Format:%T$${LITERAL_DOLLAR}") { QML_COMPILE_HASH = $$tag } else:exists($$PWD/../../.git) { commit = $$system(git rev-parse HEAD) diff --git a/src/qml/common/qqmljsfixedpoolarray_p.h b/src/qml/common/qqmljsfixedpoolarray_p.h index b65b994d6c..15a8cd6878 100644 --- a/src/qml/common/qqmljsfixedpoolarray_p.h +++ b/src/qml/common/qqmljsfixedpoolarray_p.h @@ -86,7 +86,7 @@ public: if (QTypeInfo<T>::isComplex) { for (int i = 0; i < count; ++i) new (data + i) T(vector.at(i)); - } else { + } else if (count) { memcpy(data, static_cast<const void*>(vector.constData()), count * sizeof(T)); } } |