diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 15:49:28 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:30:00 +0000 |
| commit | 7c229d3cf80d66c0261f7e63ac9b918e2cea4e57 (patch) | |
| tree | 514e825d7b33de388ce1558efa9bc327141d363a /src/qml/.prev_CMakeLists.txt | |
| parent | 1d333d3375874efb8d37df37dc5ef561573794ad (diff) | |
Post merge fixes
Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qml/.prev_CMakeLists.txt')
| -rw-r--r-- | src/qml/.prev_CMakeLists.txt | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 21119f1827..16f8cd9058 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -7,21 +7,6 @@ qt_add_module(Qml PLUGIN_TYPES qmltooling SOURCES - ../3rdparty/llvm/include/llvm-c/DataTypes.h - ../3rdparty/llvm/include/llvm/ADT/PointerIntPair.h - ../3rdparty/llvm/include/llvm/ADT/ilist.h - ../3rdparty/llvm/include/llvm/ADT/ilist_base.h - ../3rdparty/llvm/include/llvm/ADT/ilist_iterator.h - ../3rdparty/llvm/include/llvm/ADT/ilist_node.h - ../3rdparty/llvm/include/llvm/ADT/ilist_node_base.h - ../3rdparty/llvm/include/llvm/ADT/ilist_node_options.h - ../3rdparty/llvm/include/llvm/ADT/iterator.h - ../3rdparty/llvm/include/llvm/ADT/iterator_range.h - ../3rdparty/llvm/include/llvm/ADT/simple_ilist.h - ../3rdparty/llvm/include/llvm/Demangle/Compiler.h - ../3rdparty/llvm/include/llvm/Support/Compiler.h - ../3rdparty/llvm/include/llvm/Support/DataTypes.h - ../3rdparty/llvm/include/llvm/Support/PointerLikeTypeTraits.h ../3rdparty/masm/assembler/*.h ../3rdparty/masm/assembler/ARMv7Assembler.cpp ../3rdparty/masm/assembler/LinkBuffer.cpp @@ -306,7 +291,6 @@ qt_add_module(Qml ${CMAKE_CURRENT_BINARY_DIR}/jsruntime ${CMAKE_CURRENT_BINARY_DIR}/memory ${CMAKE_CURRENT_BINARY_DIR}/qmldirparser - ../3rdparty/llvm/include ../3rdparty/masm ../3rdparty/masm/assembler ../3rdparty/masm/disassembler @@ -336,6 +320,12 @@ 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" + ## Scopes: ##################################################################### |