diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-07-10 10:46:05 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-07-11 17:22:52 +0200 |
commit | de0d91abbbcf58a66018a08ca77bb4d63a5efda1 (patch) | |
tree | e960c18118f09b793b54c6767d0ffd4633da7d9d /src/qml/qml.pro | |
parent | 1948139d4c7c76817e13334e8528b01093afa69d (diff) |
Split compiler and runtime more clearly
Provide different export macros and different top level headers for
each, don't include runtime headers from compiler sources.
Change-Id: I7dc3f8c95839a00a871ba045ec65af87123154be
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml.pro')
-rw-r--r-- | src/qml/qml.pro | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 99ad6ace60..3c889244f4 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -19,31 +19,6 @@ gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks DEFINES += QT_NO_FOREACH -!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 - # the commit change also changed something in this library. - tagFile = $$PWD/../../.tag - tag = - exists($$tagFile) { - tag = $$cat($$tagFile, singleline) - QMAKE_INTERNAL_INCLUDED_FILES += $$tagFile - } - !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") { - QML_COMPILE_HASH = $$tag - } else:exists($$PWD/../../.git) { - commit = $$system(git rev-parse HEAD) - QML_COMPILE_HASH = $$commit - } - compile_hash_contents = \ - "// Generated file, DO NOT EDIT" \ - "$${LITERAL_HASH}define QML_COMPILE_HASH \"$$QML_COMPILE_HASH\"" \ - "$${LITERAL_HASH}define QML_COMPILE_HASH_LENGTH $$str_size($$QML_COMPILE_HASH)" - write_file("$$OUT_PWD/qml_compile_hash_p.h", compile_hash_contents)|error() -} - exists("qqml_enable_gcov") { QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors LIBS_PRIVATE += -lgcov @@ -64,7 +39,9 @@ greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 3)| \ WERROR += -Wno-error=unused-const-variable HEADERS += qtqmlglobal.h \ - qtqmlglobal_p.h + qtqmlglobal_p.h \ + qtqmlcompilerglobal.h \ + qtqmlcompilerglobal_p.h #modules include(common/common.pri) |