forked from qt-creator/qt-creator
CMake build: Remove usages of Qt5_VERSION
and remove checks for Qt < 6.2, since that is our minimum version. Except for sdktool and qml2puppet. Change-Id: Id36cd1a15a5a6e5480e4ae5d0a8ffaea4b2a1864 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -66,7 +66,7 @@ if (QTC_STATIC_BUILD)
|
||||
SOURCES "${CMAKE_CURRENT_BINARY_DIR}/plugin_imports.cpp"
|
||||
)
|
||||
|
||||
if (Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0 AND TARGET QmlDesigner)
|
||||
if (TARGET QmlDesigner)
|
||||
qt6_import_qml_plugins(qtcreator
|
||||
PATH_TO_SCAN "${CMAKE_CURRENT_SOURCE_DIR}/../../share/qtcreator/qmldesigner")
|
||||
endif()
|
||||
|
||||
@@ -34,7 +34,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/src/CMakeLists.txt)
|
||||
set(QLITEHTML_BIN_PATH ${IDE_BIN_PATH})
|
||||
set(QLITEHTML_LIBRARY_PATH ${IDE_LIBRARY_PATH})
|
||||
endif()
|
||||
set(QT_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
|
||||
set(QT_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
|
||||
option(BUILD_TESTING "Build litehtml tests" OFF) # otherwise litehtml downloads googletest
|
||||
add_subdirectory(qlitehtml/src)
|
||||
endif()
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
add_qtc_library(SqliteC OBJECT
|
||||
PROPERTIES AUTOMOC OFF AUTOUIC OFF QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON POSITION_INDEPENDENT_CODE ON
|
||||
CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
|
||||
DEFINES SQLITE_CORE SQLITE_CUSTOM_INCLUDE=config.h $<$<CONFIG:Debug>:SQLITE_DEBUG>
|
||||
PROPERTIES COMPILE_OPTIONS $<IF:$<CXX_COMPILER_ID:MSVC>,/FIconfig.h,-includeconfig.h>
|
||||
PUBLIC_INCLUDES
|
||||
@@ -18,7 +17,6 @@ add_qtc_library(SqliteC OBJECT
|
||||
add_qtc_library(Sqlite
|
||||
PROPERTIES AUTOMOC OFF AUTOUIC OFF
|
||||
DEPENDS Qt::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteC
|
||||
CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
|
||||
PUBLIC_INCLUDES
|
||||
"${CMAKE_CURRENT_LIST_DIR}"
|
||||
DEFINES SQLITE_CUSTOM_INCLUDE=config.h $<$<CONFIG:Debug>:SQLITE_REVERSE>
|
||||
|
||||
@@ -207,15 +207,9 @@ if ((NOT WIN32) AND (NOT APPLE))
|
||||
endif()
|
||||
|
||||
set(FONTS_BASE "${QtCreator_SOURCE_DIR}/src/share/3rdparty/studiofonts/")
|
||||
if(${Qt5_VERSION} VERSION_LESS "6")
|
||||
extend_qtc_plugin(Core
|
||||
SOURCES "${FONTS_BASE}/studiofonts.qrc"
|
||||
)
|
||||
else() # < Qt 6
|
||||
qt_add_resources(Core
|
||||
CoreWelcomeScreenFonts_rcc
|
||||
BASE ${FONTS_BASE}
|
||||
PREFIX "studiofonts"
|
||||
FILES "${FONTS_BASE}/TitilliumWeb-Regular.ttf"
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
add_qtc_plugin(QmlDesigner
|
||||
CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 AND TARGET Qt::QuickWidgets AND TARGET Qt::Svg
|
||||
CONDITION TARGET Qt::QuickWidgets AND TARGET Qt::Svg
|
||||
DEPENDS
|
||||
QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem
|
||||
Qt::QuickWidgets Qt::CorePrivate Sqlite Qt::Xml Qt::Svg
|
||||
@@ -498,7 +498,7 @@ function(get_and_add_as_subdirectory name repository git_tag build_dir source_di
|
||||
endfunction()
|
||||
|
||||
if (WITH_QMLDOM)
|
||||
if (Qt5_VERSION VERSION_LESS 6.3.2)
|
||||
if (Qt6_VERSION VERSION_LESS 6.3.2)
|
||||
message(FATAL_ERROR "You need Qt 6.3.2 or newer to enable WITH_QMLDOM feature.")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -23,13 +23,9 @@ extend_qtc_plugin(QmlPreview
|
||||
tests/qmlpreviewplugin_test.cpp tests/qmlpreviewplugin_test.h
|
||||
)
|
||||
|
||||
if(TARGET Qt${QT_VERSION_MAJOR}::QmlPrivate)
|
||||
# check if Qt version have_qml_debug_translation_protocol
|
||||
# will be introduced in Qt 6.2, but there are users
|
||||
# who needs it in older but special built Qt versions aswell
|
||||
string(REGEX MATCH "^[0-9]*" QT_VERSION_MAJOR ${Qt5_VERSION})
|
||||
if(TARGET Qt6::QmlPrivate)
|
||||
get_target_property(qmldebugprivate_include_directories
|
||||
Qt${QT_VERSION_MAJOR}::QmlPrivate
|
||||
Qt6::QmlPrivate
|
||||
INTERFACE_INCLUDE_DIRECTORIES
|
||||
)
|
||||
find_file(have_qml_debug_translation_protocol
|
||||
|
||||
Reference in New Issue
Block a user