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

Require Qt 6.4.3 for building Qt Creator

Browse Source 
And remove unneeded conditions from CMake files

Change-Id: Ibb4646f83599c5a91fbd18ce3489103e4150c49f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Eike Ziller
2024-02-19 16:11:58 +01:00
parent 6c2df76737
commit ff04dc53ef
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -73,12 +73,8 @@ find_package(Qt6
REQUIRED REQUIRED
) )
if (Qt6_VERSION VERSION_GREATER_EQUAL 6.4.3) option(WITH_QMLDESIGNER "Build QmlDesigner" ${ENV_QTC_WITH_QMLDESIGNER})
option(WITH_QMLDESIGNER "Build QmlDesigner" ${ENV_QTC_WITH_QMLDESIGNER}) add_feature_info("Build QmlDesigner and related code" ${WITH_QMLDESIGNER} "")
else()
option(WITH_QMLDESIGNER "Build QmlDesigner" OFF)
endif()
add_feature_info("Build QmlDesigner and related code (only if Qt is 6.4.3 or newer)" ${WITH_QMLDESIGNER} "")
# hack for Qbs which still supports Qt5 and Qt6 # hack for Qbs which still supports Qt5 and Qt6
if (TARGET Qt6::Core5CompatPrivate) if (TARGET Qt6::Core5CompatPrivate)

2
cmake/QtCreatorAPI.cmake
View File

@@ -3,7 +3,7 @@ if(QT_CREATOR_API_DEFINED)
endif() endif()
set(QT_CREATOR_API_DEFINED TRUE) set(QT_CREATOR_API_DEFINED TRUE)
set(IDE_QT_VERSION_MIN "6.2.0") set(IDE_QT_VERSION_MIN "6.4.3")
include(${CMAKE_CURRENT_LIST_DIR}/QtCreatorAPIInternal.cmake) include(${CMAKE_CURRENT_LIST_DIR}/QtCreatorAPIInternal.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/QtcSeparateDebugInfo.cmake) include(${CMAKE_CURRENT_LIST_DIR}/QtcSeparateDebugInfo.cmake)

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

@@ -53,7 +53,6 @@ extend_qtc_plugin(QmlProjectManager
) )
add_qtc_library(QmlProjectManagerLib OBJECT add_qtc_library(QmlProjectManagerLib OBJECT
CONDITION Qt6_VERSION VERSION_GREATER_EQUAL 6.4.3
EXCLUDE_FROM_INSTALL EXCLUDE_FROM_INSTALL
DEPENDS DEPENDS
QmlJS Utils QmlJS Utils