aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmldevtools
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-09 13:53:53 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-12 14:05:23 +0000
commit14492ecee2e34843efd3ef070503a43a48552055 (patch)
tree37432296f2f6bbc596d2470f79c99ce68801567c /src/qmldevtools
parent26c5243491f495194f04b449128dae36118e28da (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/qmldevtools')
-rw-r--r--src/qmldevtools/.prev_CMakeLists.txt2
-rw-r--r--src/qmldevtools/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt
index 702fa3be59..a1f121d6d0 100644
--- a/src/qmldevtools/.prev_CMakeLists.txt
+++ b/src/qmldevtools/.prev_CMakeLists.txt
@@ -13,6 +13,7 @@ qt_add_module(QmlDevTools
../qml/common/qqmljsdiagnosticmessage_p.h
../qml/common/qqmljsfixedpoolarray_p.h
../qml/common/qqmljsmemorypool_p.h
+ ../qml/common/qqmljssourcelocation_p.h
../qml/common/qv4alloca_p.h
../qml/common/qv4calldata_p.h
../qml/common/qv4compileddata_p.h
@@ -36,7 +37,6 @@ qt_add_module(QmlDevTools
../qml/parser/qqmljsglobal_p.h
../qml/parser/qqmljskeywords_p.h
../qml/parser/qqmljslexer.cpp ../qml/parser/qqmljslexer_p.h
- ../qml/parser/qqmljssourcelocation_p.h
../qml/qmldirparser/qqmldirparser.cpp ../qml/qmldirparser/qqmldirparser_p.h
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_BINARY_DIR}/../qml
diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt
index 439b89dcec..b0dba5c396 100644
--- a/src/qmldevtools/CMakeLists.txt
+++ b/src/qmldevtools/CMakeLists.txt
@@ -13,6 +13,7 @@ qt_add_module(QmlDevTools
../qml/common/qqmljsdiagnosticmessage_p.h
../qml/common/qqmljsfixedpoolarray_p.h
../qml/common/qqmljsmemorypool_p.h
+ ../qml/common/qqmljssourcelocation_p.h
../qml/common/qv4alloca_p.h
../qml/common/qv4calldata_p.h
../qml/common/qv4compileddata_p.h
@@ -36,7 +37,6 @@ qt_add_module(QmlDevTools
../qml/parser/qqmljsglobal_p.h
../qml/parser/qqmljskeywords_p.h
../qml/parser/qqmljslexer.cpp ../qml/parser/qqmljslexer_p.h
- ../qml/parser/qqmljssourcelocation_p.h
../qml/qmldirparser/qqmldirparser.cpp ../qml/qmldirparser/qqmldirparser_p.h
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_BINARY_DIR}/../qml