diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-13 15:30:41 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-17 14:07:56 +0000 |
| commit | 188e44aa42b9138cb8aba13a0cabf7057ab8c462 (patch) | |
| tree | 48efe05bba88009c9a1f393df48c4c1126ea3367 | |
| parent | 5a3e668533450e82d0159596e5c24e738905f5f7 (diff) | |
Fix declarative build
- qmltest examples should not be built for now (there's no ported
CMakeLists.txt file)
- when building QmlDevTools, qml_module_include_dir should only be
included during building, because those are build directory paths.
- QmlTest was missing some private dependencies to find private
includes
Change-Id: I22a77cd46f82bc61ab84aa7bc4c9d0e38a9d603a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| -rw-r--r-- | examples/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/qmldevtools/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/qmltest/CMakeLists.txt | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 74e685448e..81892b1661 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -2,9 +2,9 @@ add_subdirectory(qml) -if(TARGET Qt::QuickTest) - add_subdirectory(qmltest) -endif() +#if(TARGET Qt::QuickTest) + #add_subdirectory(qmltest) +#endif() #if(TARGET Qt::Quick) #add_subdirectory(quick) diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt index c8df1b7a75..586ad4ac47 100644 --- a/src/qmldevtools/CMakeLists.txt +++ b/src/qmldevtools/CMakeLists.txt @@ -58,9 +58,9 @@ qt_process_qlalr("${CMAKE_CURRENT_SOURCE_DIR}/../qml/parser/qqmljs.g" QmlDevTool # until we fix the script to handle internal_module to create only one single Private module. qt_internal_module_info(qml_module "Qml") set(_qml_dev_tools_private_includes - ${qml_module_include_dir} - ${qml_module_include_dir}/${PROJECT_VERSION} - ${qml_module_include_dir}/${PROJECT_VERSION}/${qml_module} + $<BUILD_INTERFACE:${qml_module_include_dir}> + $<BUILD_INTERFACE:${qml_module_include_dir}/${PROJECT_VERSION}> + $<BUILD_INTERFACE:${qml_module_include_dir}/${PROJECT_VERSION}/${qml_module}> ) target_include_directories(QmlDevTools PRIVATE ${_qml_dev_tools_private_includes}) target_include_directories(QmlDevToolsPrivate INTERFACE ${_qml_dev_tools_private_includes}) diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index b5d8a61d45..c9d13711d7 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -17,6 +17,9 @@ add_qt_module(QuickTest QT_NO_URL_CAST_FROM_STRING LIBRARIES Qt::TestPrivate + Qt::Quick # special case + Qt::QuickPrivate # special case + Qt::QmlPrivate # special case PUBLIC_LIBRARIES Qt::Core Qt::Test |