diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 18:33:07 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:42 +0000 |
commit | 30917cd20ce1e40482e967fdafb5f8b95a62b640 (patch) | |
tree | 090589f0c9984fc5a0715844fdfa7b993551bab6 /src/qml/.prev_CMakeLists.txt | |
parent | c2f8b9535d34da6948ccf45b7d5fd90de2f1bc9e (diff) |
Regenerate required projects after dev -> wip/cmake merge
Change-Id: Ic5f1909731ec11b4fb6bc8823506d272c529ecfb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/.prev_CMakeLists.txt')
-rw-r--r-- | src/qml/.prev_CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 222e2a622b..ee1f3cb31f 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -330,8 +330,8 @@ add_qt_module(Qml # QLALR Grammars: qt_process_qlalr( - parser/qqmljs.g Qml + parser/qqmljs.g "" ) @@ -505,7 +505,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_locale extend_target(Qml CONDITION ANDROID DEFINES - LIBS_SUFFIX='\\"_.so\\"' + LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"' ) extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_) |