diff options
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/qml/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 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_) diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 860eb242e3..0837084af5 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -331,8 +331,8 @@ add_qt_module(Qml # special case begin remove the block, handled manually # QLALR Grammars: #qt_process_qlalr( -# parser/qqmljs.g # Qml +# parser/qqmljs.g # "" #) # special case end @@ -514,7 +514,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_) |