diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-09 13:53:53 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 14:05:23 +0000 |
| commit | 14492ecee2e34843efd3ef070503a43a48552055 (patch) | |
| tree | 37432296f2f6bbc596d2470f79c99ce68801567c /src/qml/.prev_CMakeLists.txt | |
| parent | 26c5243491f495194f04b449128dae36118e28da (diff) | |
CMake: Regenerate and adapt to merge from devwip/cmake
Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Diffstat (limited to 'src/qml/.prev_CMakeLists.txt')
| -rw-r--r-- | src/qml/.prev_CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 504d26e03d..9528b3068a 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -55,6 +55,7 @@ qt_add_module(Qml common/qqmljsdiagnosticmessage_p.h common/qqmljsfixedpoolarray_p.h common/qqmljsmemorypool_p.h + common/qqmljssourcelocation_p.h common/qv4alloca_p.h common/qv4calldata_p.h common/qv4compileddata_p.h @@ -163,7 +164,6 @@ qt_add_module(Qml parser/qqmljsglobal_p.h parser/qqmljskeywords_p.h parser/qqmljslexer.cpp parser/qqmljslexer_p.h - parser/qqmljssourcelocation_p.h qml/ftw/qbitfield_p.h qml/ftw/qfieldlist_p.h qml/ftw/qfinitestack_p.h @@ -325,10 +325,10 @@ qt_process_qlalr( ) #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml" # QML_IMPORT_NAME = "QtQml" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -497,7 +497,7 @@ qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale qt_extend_target(Qml CONDITION ANDROID DEFINES - LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"' + LIBS_SUFFIX="_${CMAKE_SYSTEM_PROCESSOR}.so" ) qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_) @@ -611,7 +611,7 @@ qt_add_docs(Qml set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" ) |