summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2021-03-31 11:53:36 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-04-01 05:19:44 +0000
commit05a64936bb350a3f4e8e4fa56e383b8642003407 (patch)
tree2f814b678135023eef484e665872d54d232c7091
parent17497d0480bc3696e44b1d492c996e9c65b8e8c7 (diff)
Fix missing 'We mean it' warning for generated qml_compile_hash_p.h
Change-Id: I327d377c80749741274a76dfa609417c005bf6c7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 403ecb6422b499d9033934148994fe251acc937b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--cmake/QtDeclarativeSetup.cmake8
-rw-r--r--src/qml/qml_compile_hash_p.h.in15
2 files changed, 16 insertions, 7 deletions
diff --git a/cmake/QtDeclarativeSetup.cmake b/cmake/QtDeclarativeSetup.cmake
index d8e4719dbf..cd5ae32e14 100644
--- a/cmake/QtDeclarativeSetup.cmake
+++ b/cmake/QtDeclarativeSetup.cmake
@@ -15,13 +15,7 @@ function(qt_declarative_write_tag_header target_name)
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
string(LENGTH "${QML_COMPILE_HASH}" QML_COMPILE_HASH_LENGTH)
- set(compile_hash_contents "// Generated file, DO NOT EDIT
- #define QML_COMPILE_HASH \"${QML_COMPILE_HASH}\"
- #define QML_COMPILE_HASH_LENGTH ${QML_COMPILE_HASH_LENGTH}"
- )
- set(compile_hash_output_path "${CMAKE_CURRENT_BINARY_DIR}/qml_compile_hash_p.h")
- file(GENERATE OUTPUT "${compile_hash_output_path}"
- CONTENT "${compile_hash_contents}")
+ configure_file("qml_compile_hash_p.h.in" "${CMAKE_CURRENT_BINARY_DIR}/qml_compile_hash_p.h")
endfunction()
find_package(PythonInterp REQUIRED)
diff --git a/src/qml/qml_compile_hash_p.h.in b/src/qml/qml_compile_hash_p.h.in
new file mode 100644
index 0000000000..3316da16d6
--- /dev/null
+++ b/src/qml/qml_compile_hash_p.h.in
@@ -0,0 +1,15 @@
+// Generated file, DO NOT EDIT
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#define QML_COMPILE_HASH "${QML_COMPILE_HASH}"
+#define QML_COMPILE_HASH_LENGTH ${QML_COMPILE_HASH_LENGTH}