diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 14:51:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:24:39 +0200 |
| commit | 13374ceb165c44658aa97890c37b206859c9a31c (patch) | |
| tree | 562362b196a459ee3449a5a1e60e5216a9dd6984 /src/qmldevtools | |
| parent | ae47deba4c943c496412530a8d2a5a688ae12038 (diff) | |
| parent | b5d18be5a03406d0aac83856dd41e1525fd14a28 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I2963c1209316fb6755f572969f368970450d7991
Diffstat (limited to 'src/qmldevtools')
| -rw-r--r-- | src/qmldevtools/.prev_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/qmldevtools/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/qmldevtools/qmldevtools.pro | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt index 24b87902ea..9f3587f2a0 100644 --- a/src/qmldevtools/.prev_CMakeLists.txt +++ b/src/qmldevtools/.prev_CMakeLists.txt @@ -9,13 +9,15 @@ add_qt_module(QmlDevTools INTERNAL_MODULE NO_SYNC_QT SOURCES + ../qml/common/qqmlapiversion_p.h + ../qml/common/qqmljsdiagnosticmessage_p.h ../qml/compiler/qqmlirbuilder.cpp ../qml/compiler/qqmlirbuilder_p.h ../qml/compiler/qv4alloca_p.h ../qml/compiler/qv4bytecodegenerator.cpp ../qml/compiler/qv4bytecodegenerator_p.h ../qml/compiler/qv4bytecodehandler.cpp ../qml/compiler/qv4bytecodehandler_p.h ../qml/compiler/qv4calldata_p.h ../qml/compiler/qv4codegen.cpp ../qml/compiler/qv4codegen_p.h - ../qml/compiler/qv4compileddata.cpp ../qml/compiler/qv4compileddata_p.h + ../qml/compiler/qv4compileddata_p.h ../qml/compiler/qv4compiler.cpp ../qml/compiler/qv4compiler_p.h ../qml/compiler/qv4compilercontext.cpp ../qml/compiler/qv4compilercontext_p.h ../qml/compiler/qv4compilercontrolflow_p.h @@ -34,8 +36,6 @@ add_qt_module(QmlDevTools ../qml/parser/qqmljsmemorypool_p.h ../qml/parser/qqmljssourcelocation_p.h ../qml/qmldirparser/qqmldirparser.cpp ../qml/qmldirparser/qqmldirparser_p.h - ../qml/qmldirparser/qqmlerror.cpp ../qml/qmldirparser/qqmlerror.h - ../qml/qmldirparser/qqmlsourcecoordinate_p.h INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/../qml ${CMAKE_CURRENT_BINARY_DIR}/../qml/compiler diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt index 586ad4ac47..9ed5aad94a 100644 --- a/src/qmldevtools/CMakeLists.txt +++ b/src/qmldevtools/CMakeLists.txt @@ -9,13 +9,15 @@ add_qt_module(QmlDevTools INTERNAL_MODULE NO_SYNC_QT SOURCES + ../qml/common/qqmlapiversion_p.h + ../qml/common/qqmljsdiagnosticmessage_p.h ../qml/compiler/qqmlirbuilder.cpp ../qml/compiler/qqmlirbuilder_p.h ../qml/compiler/qv4alloca_p.h ../qml/compiler/qv4bytecodegenerator.cpp ../qml/compiler/qv4bytecodegenerator_p.h ../qml/compiler/qv4bytecodehandler.cpp ../qml/compiler/qv4bytecodehandler_p.h ../qml/compiler/qv4calldata_p.h ../qml/compiler/qv4codegen.cpp ../qml/compiler/qv4codegen_p.h - ../qml/compiler/qv4compileddata.cpp ../qml/compiler/qv4compileddata_p.h + ../qml/compiler/qv4compileddata_p.h ../qml/compiler/qv4compiler.cpp ../qml/compiler/qv4compiler_p.h ../qml/compiler/qv4compilercontext.cpp ../qml/compiler/qv4compilercontext_p.h ../qml/compiler/qv4compilercontrolflow_p.h @@ -34,8 +36,6 @@ add_qt_module(QmlDevTools ../qml/parser/qqmljsmemorypool_p.h ../qml/parser/qqmljssourcelocation_p.h ../qml/qmldirparser/qqmldirparser.cpp ../qml/qmldirparser/qqmldirparser_p.h - ../qml/qmldirparser/qqmlerror.cpp ../qml/qmldirparser/qqmlerror.h - ../qml/qmldirparser/qqmlsourcecoordinate_p.h INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/../qml ${CMAKE_CURRENT_BINARY_DIR}/../qml/compiler diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro index 4227312f3f..bea3c864cd 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/src/qmldevtools/qmldevtools.pro @@ -12,6 +12,7 @@ intel_icc: WERROR += -ww2415 clang:if(greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 3)): \ WERROR += -Wno-error=unused-const-variable +include(../qml/common/common.pri) include(../qml/parser/parser.pri) include(../qml/compiler/compiler.pri) include(../qml/qmldirparser/qmldirparser.pri) |