diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 19:07:06 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 10:22:26 +0000 |
| commit | e9cac99f3796740ea93b23b0fe893fc880e0b5d4 (patch) | |
| tree | 7bb8d41c520e9d59bd2a39cf53ab8c948db57511 /src/qml/CMakeLists.txt | |
| parent | 82525a2b3861ad695c156c2cac4239134f8ac922 (diff) | |
Regenerate projects
Change-Id: I38044c382e4d84b5865a19cdd04cc8922bd72a77
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/CMakeLists.txt')
| -rw-r--r-- | src/qml/CMakeLists.txt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 2be9e58bc9..df2cdf417d 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -335,12 +335,7 @@ add_qt_module(Qml # parser/qqmljs.g # "" #) -# special case end - -#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: -# _LOADED = "qt_module" -# special case begin qt_declarative_write_tag_header(Qml) set(_qt_qlalr_flags "--no-debug" "--qt") qt_process_qlalr(Qml "${CMAKE_CURRENT_SOURCE_DIR}/parser/qqmljs.g" "${_qt_qlalr_flags}") @@ -391,7 +386,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov" -ftest-coverage ) -extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___19 AND QT_CL_MINOR_VERSION___equals___00 AND greaterThan(QT_CL_PATCH_VERSION,24212) +extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212) COMPILE_OPTIONS -d2SSAOptimizer- ) @@ -399,7 +394,7 @@ extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___ #### Keys ignored in scope 10:.:.:qml.pro:ICC: # WERROR = "-ww2415" -#### Keys ignored in scope 11:.:.:qml.pro:greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) OR greaterThan(QT_APPLE_CLANG_MAJOR_VERSION,5) OR ( QT_APPLE_CLANG_MAJOR_VERSION___equals___5 AND greaterThan(QT_APPLE_CLANG_MINOR_VERSION,0) ): +#### Keys ignored in scope 11:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ): # WERROR = "-Wno-error=unused-const-variable" extend_target(Qml CONDITION QT_FEATURE_qml_jit |