feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake build: Allow compilation without QtQuick

Browse Source 
Disable the parts that require it in that case.

Change-Id: I3f62eb9b325905ea225009aad6b9020cef545da6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2021-10-20 11:38:26 +02:00
parent 181a2927fe
commit ae0b648a85
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -49,8 +49,7 @@ endif()
find_package(Qt5 find_package(Qt5
${IDE_QT_VERSION_MIN} ${IDE_QT_VERSION_MIN}
COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick COMPONENTS Concurrent Core Gui Network PrintSupport Qml Sql Widgets Xml Core5Compat ${QT_TEST_COMPONENT}
QuickWidgets Sql Widgets Xml Core5Compat ${QT_TEST_COMPONENT}
REQUIRED REQUIRED
) )
if (Qt5_VERSION VERSION_LESS 6.0.0) if (Qt5_VERSION VERSION_LESS 6.0.0)
@@ -66,7 +65,7 @@ else()
set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml_modules") set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml_modules")
endif() endif()
find_package(Qt5 COMPONENTS LinguistTools QUIET) find_package(Qt5 COMPONENTS LinguistTools QUIET)
find_package(Qt5 COMPONENTS Designer DesignerComponents Help SerialPort Svg Tools QUIET) find_package(Qt5 COMPONENTS Quick QuickWidgets Designer DesignerComponents Help SerialPort Svg Tools QUIET)
option(BUILD_WITH_PCH "Build with precompiled headers" ON) option(BUILD_WITH_PCH "Build with precompiled headers" ON)

3
src/CMakeLists.txt
View File

@@ -51,8 +51,9 @@ endif()
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
find_dependency(Qt5 ${IDE_QT_VERSION_MIN} find_dependency(Qt5 ${IDE_QT_VERSION_MIN}
COMPONENTS Concurrent Core Gui Widgets Core5Compat Network PrintSupport Qml Quick QuickWidgets Sql REQUIRED COMPONENTS Concurrent Core Gui Widgets Core5Compat Network PrintSupport Qml Sql REQUIRED
) )
find_dependency(Qt5 COMPONENTS Quick QuickWidgets QUIET)
if (NOT IDE_VERSION) if (NOT IDE_VERSION)
include(\${CMAKE_CURRENT_LIST_DIR}/QtCreatorIDEBranding.cmake) include(\${CMAKE_CURRENT_LIST_DIR}/QtCreatorIDEBranding.cmake)

2
src/libs/tracing/CMakeLists.txt
View File

@@ -46,7 +46,7 @@ else() # < Qt 6.2
find_package(Qt6 COMPONENTS ShaderTools QUIET) find_package(Qt6 COMPONENTS ShaderTools QUIET)
add_qtc_library(Tracing add_qtc_library(Tracing
CONDITION TARGET Qt6::ShaderTools CONDITION TARGET Qt6::ShaderTools AND TARGET Qt5::Quick
FEATURE_INFO FEATURE_INFO
DEPENDS Utils Qt5::Qml Qt5::Quick DEPENDS Utils Qt5::Qml Qt5::Quick
PUBLIC_DEPENDS Qt5::Widgets PUBLIC_DEPENDS Qt5::Widgets

1
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -4,6 +4,7 @@ if (APPLE)
endif() endif()
add_qtc_plugin(QmlDesigner add_qtc_plugin(QmlDesigner
CONDITION TARGET Qt5::QuickWidgets
DEPENDS DEPENDS
QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem
Qt5::QuickWidgets Qt5::CorePrivate Sqlite Qt5::QuickWidgets Qt5::CorePrivate Sqlite

1
src/plugins/studiowelcome/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
add_qtc_plugin(StudioWelcome add_qtc_plugin(StudioWelcome
CONDITION TARGET Qt5::QuickWidgets
DEPENDS Qt5::QuickWidgets DEPENDS Qt5::QuickWidgets
PLUGIN_DEPENDS Core ProjectExplorer QtSupport PLUGIN_DEPENDS Core ProjectExplorer QtSupport
DEFINES STUDIO_QML_PATH="${CMAKE_CURRENT_SOURCE_DIR}/qml/" DEFINES STUDIO_QML_PATH="${CMAKE_CURRENT_SOURCE_DIR}/qml/"

1
src/tools/qml2puppet/CMakeLists.txt
View File

@@ -97,6 +97,7 @@ extend_qtc_library(qml2puppet_static
) )
add_qtc_executable(qml2puppet add_qtc_executable(qml2puppet
CONDITION TARGET Qt5::QuickPrivate
DEPENDS DEPENDS
Qt5::CorePrivate Qt5::Widgets Qt5::QmlPrivate Qt5::CorePrivate Qt5::Widgets Qt5::QmlPrivate
Qt5::QuickPrivate Qt5::Network Qt5::GuiPrivate Qt5::QuickPrivate Qt5::Network Qt5::GuiPrivate