2014-12-01 19:55:22 +00:00
|
|
|
macro(tr_auto_option_changed NAME ACC VAL FIL STK)
|
|
|
|
if(NOT ("${VAL}" STREQUAL "AUTO" OR "${VAL}" STREQUAL "ON" OR "${VAL}" STREQUAL "OFF"))
|
|
|
|
if("${VAL}" STREQUAL "0" OR "${VAL}" STREQUAL "NO" OR "${VAL}" STREQUAL "FALSE" OR "${VAL}" STREQUAL "N")
|
|
|
|
set_property(CACHE ${NAME} PROPERTY VALUE OFF)
|
|
|
|
elseif("${VAL}" MATCHES "^[-+]?[0-9]+$" OR "${VAL}" STREQUAL "YES" OR "${VAL}" STREQUAL "TRUE" OR "${VAL}" STREQUAL "Y")
|
|
|
|
set_property(CACHE ${NAME} PROPERTY VALUE ON)
|
|
|
|
else()
|
|
|
|
message(FATAL_ERROR "Option '${NAME}' set to unrecognized value '${VAL}'. Should be boolean or 'AUTO'.")
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
endmacro()
|
|
|
|
|
|
|
|
macro(tr_auto_option NAME DESC VAL)
|
|
|
|
set(${NAME} "${VAL}" CACHE STRING "${DESC}")
|
|
|
|
set_property(CACHE ${NAME} PROPERTY STRINGS "AUTO;ON;OFF")
|
|
|
|
variable_watch(${NAME} tr_auto_option_changed)
|
|
|
|
endmacro()
|
|
|
|
|
|
|
|
macro(tr_fixup_auto_option NAME ISFOUND ISREQ)
|
|
|
|
if(${ISFOUND})
|
|
|
|
set_property(CACHE ${NAME} PROPERTY VALUE ON)
|
|
|
|
elseif(NOT (${ISREQ}))
|
|
|
|
set_property(CACHE ${NAME} PROPERTY VALUE OFF)
|
|
|
|
endif()
|
|
|
|
endmacro()
|
|
|
|
|
2015-01-07 02:04:08 +00:00
|
|
|
function(tr_list_option_changed NAME ACC VAL FIL STK)
|
|
|
|
get_property(VAR_STRINGS CACHE ${NAME} PROPERTY STRINGS)
|
|
|
|
string(TOUPPER "${VAL}" VAL_UPCASE)
|
|
|
|
foreach(X ${VAR_STRINGS})
|
|
|
|
string(TOUPPER "${X}" X_UPCASE)
|
|
|
|
if("${VAL_UPCASE}" STREQUAL "${X_UPCASE}")
|
|
|
|
if(NOT "${VAL}" STREQUAL "${X}")
|
|
|
|
set_property(CACHE ${NAME} PROPERTY VALUE "${X}")
|
|
|
|
message(STATUS ">>> (list) ${NAME} -> ${X}")
|
|
|
|
endif()
|
|
|
|
return()
|
|
|
|
endif()
|
|
|
|
endforeach()
|
|
|
|
string(REPLACE ";" "', '" VAR_STRINGS "${VAR_STRINGS}")
|
|
|
|
message(FATAL_ERROR "Option '${NAME}' set to unrecognized value '${VAL}'. Should be one of '${VAR_STRINGS}'.")
|
|
|
|
endfunction()
|
|
|
|
|
|
|
|
macro(tr_list_option NAME DESC VAL)
|
|
|
|
set(${NAME} "${VAL}" CACHE STRING "${DESC}")
|
|
|
|
set_property(CACHE ${NAME} PROPERTY STRINGS "${VAL};${ARGN}")
|
|
|
|
variable_watch(${NAME} tr_list_option_changed)
|
|
|
|
endmacro()
|
|
|
|
|
|
|
|
macro(tr_fixup_list_option NAME FVAL ISFOUND RVAL ISREQ)
|
|
|
|
if(${ISFOUND})
|
|
|
|
set_property(CACHE ${NAME} PROPERTY VALUE "${FVAL}")
|
|
|
|
elseif(NOT (${ISREQ}))
|
|
|
|
set_property(CACHE ${NAME} PROPERTY VALUE "${RVAL}")
|
|
|
|
endif()
|
|
|
|
endmacro()
|
|
|
|
|
2014-12-01 19:55:22 +00:00
|
|
|
macro(tr_get_required_flag IVAR OVAR)
|
|
|
|
set(${OVAR})
|
|
|
|
if (${IVAR} AND NOT ${IVAR} STREQUAL "AUTO")
|
|
|
|
set(${OVAR} REQUIRED)
|
|
|
|
endif()
|
|
|
|
endmacro()
|
|
|
|
|
|
|
|
function(tr_make_id INPUT OVAR)
|
|
|
|
string(TOUPPER "${INPUT}" ID)
|
|
|
|
string(REGEX REPLACE "[^A-Z0-9]+" "_" ID "${ID}")
|
2015-06-01 18:52:14 +00:00
|
|
|
# string(REGEX REPLACE "^_+|_+$" "" ID "${ID}")
|
2014-12-01 19:55:22 +00:00
|
|
|
set(${OVAR} "${ID}" PARENT_SCOPE)
|
|
|
|
endfunction()
|
|
|
|
|
2017-01-01 18:40:11 +00:00
|
|
|
macro(tr_add_external_auto_library ID DIRNAME LIBNAME)
|
2014-12-01 19:55:22 +00:00
|
|
|
if(USE_SYSTEM_${ID})
|
|
|
|
tr_get_required_flag(USE_SYSTEM_${ID} SYSTEM_${ID}_IS_REQUIRED)
|
|
|
|
find_package(${ID} ${${ID}_MINIMUM} ${SYSTEM_${ID}_IS_REQUIRED})
|
|
|
|
tr_fixup_auto_option(USE_SYSTEM_${ID} ${ID}_FOUND SYSTEM_${ID}_IS_REQUIRED)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(USE_SYSTEM_${ID})
|
|
|
|
unset(${ID}_UPSTREAM_TARGET)
|
|
|
|
else()
|
2017-01-01 18:40:11 +00:00
|
|
|
set(${ID}_UPSTREAM_TARGET ${LIBNAME})
|
2014-12-01 19:55:22 +00:00
|
|
|
set(${ID}_PREFIX "${CMAKE_BINARY_DIR}/third-party/${${ID}_UPSTREAM_TARGET}")
|
|
|
|
|
2016-10-30 22:22:05 +00:00
|
|
|
set(${ID}_INCLUDE_DIR "${${ID}_PREFIX}/include" CACHE INTERNAL "")
|
|
|
|
set(${ID}_LIBRARY "${${ID}_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${LIBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE INTERNAL "")
|
|
|
|
|
|
|
|
set(${ID}_INCLUDE_DIRS ${${ID}_INCLUDE_DIR})
|
|
|
|
set(${ID}_LIBRARIES ${${ID}_LIBRARY})
|
|
|
|
|
2021-10-25 08:14:04 +00:00
|
|
|
set(${ID}_EXT_PROJ_CMAKE_ARGS)
|
|
|
|
if(APPLE)
|
|
|
|
string(REPLACE ";" "$<SEMICOLON>" ${ID}_CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
|
|
|
|
list(APPEND ${ID}_EXT_PROJ_CMAKE_ARGS
|
|
|
|
"-DCMAKE_OSX_ARCHITECTURES:STRING=${${ID}_CMAKE_OSX_ARCHITECTURES}"
|
|
|
|
"-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}"
|
|
|
|
"-DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}")
|
|
|
|
endif()
|
|
|
|
|
2014-12-01 19:55:22 +00:00
|
|
|
ExternalProject_Add(
|
|
|
|
${${ID}_UPSTREAM_TARGET}
|
2017-01-01 18:40:11 +00:00
|
|
|
URL "${CMAKE_SOURCE_DIR}/third-party/${DIRNAME}"
|
2014-12-01 19:55:22 +00:00
|
|
|
${ARGN}
|
|
|
|
PREFIX "${${ID}_PREFIX}"
|
|
|
|
CMAKE_ARGS
|
2015-01-01 22:20:57 +00:00
|
|
|
-Wno-dev # We don't want to be warned over unused variables
|
2014-12-20 22:28:43 +00:00
|
|
|
"-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}"
|
2017-01-22 11:11:49 +00:00
|
|
|
"-DCMAKE_USER_MAKE_RULES_OVERRIDE=${CMAKE_USER_MAKE_RULES_OVERRIDE}"
|
2022-04-17 02:17:28 +00:00
|
|
|
"-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
|
2014-12-01 19:55:22 +00:00
|
|
|
"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"
|
2022-04-17 02:17:28 +00:00
|
|
|
"-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
|
2014-12-01 19:55:22 +00:00
|
|
|
"-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}"
|
|
|
|
"-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
|
|
|
|
"-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>"
|
2022-07-08 15:13:22 +00:00
|
|
|
"-DCMAKE_INSTALL_LIBDIR:STRING=lib"
|
2021-10-25 08:14:04 +00:00
|
|
|
${${ID}_EXT_PROJ_CMAKE_ARGS}
|
2016-10-30 22:22:05 +00:00
|
|
|
BUILD_BYPRODUCTS "${${ID}_LIBRARY}"
|
2014-12-01 19:55:22 +00:00
|
|
|
)
|
|
|
|
|
2015-04-14 22:46:40 +00:00
|
|
|
set_property(TARGET ${${ID}_UPSTREAM_TARGET} PROPERTY FOLDER "ThirdParty")
|
2014-12-01 19:55:22 +00:00
|
|
|
endif()
|
|
|
|
endmacro()
|
2015-01-04 10:57:09 +00:00
|
|
|
|
|
|
|
function(tr_append_target_property TGT PROP VAL)
|
|
|
|
get_target_property(OVAL ${TGT} ${PROP})
|
|
|
|
if(OVAL)
|
|
|
|
set(VAL "${OVAL} ${VAL}")
|
|
|
|
endif()
|
|
|
|
set_target_properties(${TGT} PROPERTIES ${PROP} "${VAL}")
|
|
|
|
endfunction()
|
2015-04-14 22:46:40 +00:00
|
|
|
|
|
|
|
function(tr_win32_app_info OVAR DESCR INTNAME ORIGFNAME)
|
|
|
|
if(NOT WIN32)
|
|
|
|
return()
|
|
|
|
endif()
|
|
|
|
|
|
|
|
set(TR_FILE_DESCRIPTION "${DESCR}")
|
|
|
|
set(TR_INTERNAL_NAME "${INTNAME}")
|
|
|
|
set(TR_ORIGINAL_FILENAME "${ORIGFNAME}")
|
|
|
|
if(ARGN)
|
|
|
|
set(TR_MAIN_ICON "${ARGN}")
|
|
|
|
endif()
|
|
|
|
|
2015-11-26 00:18:06 +00:00
|
|
|
configure_file("${CMAKE_SOURCE_DIR}/cmake/Transmission.rc.in" "${INTNAME}-app-info.rc")
|
2015-04-14 22:46:40 +00:00
|
|
|
|
2015-11-26 00:18:06 +00:00
|
|
|
set(${OVAR} "${CMAKE_CURRENT_BINARY_DIR}/${INTNAME}-app-info.rc" PARENT_SCOPE)
|
2015-04-14 22:46:40 +00:00
|
|
|
endfunction()
|
2016-12-24 17:11:27 +00:00
|
|
|
|
|
|
|
function(tr_select_library LIBNAMES FUNCNAME DIRS OVAR)
|
|
|
|
set(LIBNAME)
|
|
|
|
foreach(X ${LIBNAMES})
|
|
|
|
set(VAR_NAME "HAVE_${FUNCNAME}_IN_LIB${X}")
|
|
|
|
string(TOUPPER "${VAR_NAME}" VAR_NAME)
|
|
|
|
check_library_exists("${X}" "${FUNCNAME}" "${DIRS}" ${VAR_NAME})
|
|
|
|
if(${VAR_NAME})
|
|
|
|
set(LIBNAME "${X}")
|
|
|
|
break()
|
|
|
|
endif()
|
|
|
|
endforeach()
|
|
|
|
set(${OVAR} "${LIBNAME}" PARENT_SCOPE)
|
|
|
|
endfunction()
|
2016-09-10 17:08:58 +00:00
|
|
|
|
|
|
|
function(tr_fixup_bundle_item BUNDLE_DIR BUNDLE_ITEMS DEP_DIRS)
|
|
|
|
while(BUNDLE_ITEMS)
|
|
|
|
list(GET BUNDLE_ITEMS 0 ITEM)
|
|
|
|
list(REMOVE_AT BUNDLE_ITEMS 0)
|
|
|
|
|
|
|
|
set(ITEM_FULL_BUNDLE_PATH "${BUNDLE_DIR}/${ITEM}")
|
|
|
|
get_filename_component(ITEM_FULL_BUNDLE_DIR "${ITEM_FULL_BUNDLE_PATH}" PATH)
|
|
|
|
|
|
|
|
unset(ITEM_DEPS)
|
|
|
|
get_prerequisites("${ITEM_FULL_BUNDLE_PATH}" ITEM_DEPS 1 0 "${ITEM_FULL_BUNDLE_PATH}" "${DEP_DIRS}")
|
|
|
|
|
|
|
|
foreach(DEP IN LISTS ITEM_DEPS)
|
|
|
|
gp_resolve_item("${ITEM_FULL_BUNDLE_PATH}" "${DEP}" "${ITEM_FULL_BUNDLE_DIR}" "${DEP_DIRS}" DEP_FULL_PATH)
|
|
|
|
|
|
|
|
if(DEP_FULL_PATH MATCHES "[.]dylib$")
|
|
|
|
get_filename_component(DEP_NAME "${DEP_FULL_PATH}" NAME)
|
|
|
|
file(COPY "${DEP_FULL_PATH}" DESTINATION "${BUNDLE_DIR}/Contents/MacOS/")
|
|
|
|
set(DEP_BUNDLE_PATH "Contents/MacOS/${DEP_NAME}")
|
|
|
|
elseif(DEP_FULL_PATH MATCHES "^(.+)/(([^/]+[.]framework)/.+)$")
|
|
|
|
set(DEP_NAME "${CMAKE_MATCH_2}")
|
|
|
|
file(COPY "${CMAKE_MATCH_1}/${CMAKE_MATCH_3}" DESTINATION "${BUNDLE_DIR}/Contents/Frameworks/" PATTERN "Headers" EXCLUDE)
|
|
|
|
set(DEP_BUNDLE_PATH "Contents/Frameworks/${DEP_NAME}")
|
|
|
|
else()
|
|
|
|
message(FATAL_ERROR "Don't know how to fixup '${DEP_FULL_PATH}'")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
execute_process(COMMAND install_name_tool -change "${DEP}" "@rpath/${DEP_NAME}" "${ITEM_FULL_BUNDLE_PATH}")
|
|
|
|
|
|
|
|
set(DEP_FULL_BUNDLE_PATH "${BUNDLE_DIR}/${DEP_BUNDLE_PATH}")
|
|
|
|
execute_process(COMMAND chmod u+w "${DEP_FULL_BUNDLE_PATH}")
|
|
|
|
execute_process(COMMAND install_name_tool -id "@rpath/${DEP_NAME}" "${DEP_FULL_BUNDLE_PATH}")
|
|
|
|
|
|
|
|
list(REMOVE_ITEM BUNDLE_ITEMS "${DEP_BUNDLE_PATH}")
|
|
|
|
list(APPEND BUNDLE_ITEMS "${DEP_BUNDLE_PATH}")
|
|
|
|
endforeach()
|
|
|
|
endwhile()
|
|
|
|
endfunction()
|
2017-02-11 10:24:42 +00:00
|
|
|
|
|
|
|
macro(tr_qt_wrap_ui)
|
Qt 6 support (#2069)
* Bump minimum Qt version to 5.6
* Switch from QRegExp to QRegularExpression
While still available, QRegExp has been moved to Qt6::Core5Compat module
and is not part of Qt6::Core.
* Use qIsEffectiveTLD instead of QUrl::topLevelDomain
The latter is not part of Qt6::Core. The former is a private utility in
Qt6::Network; using it for now, until (and if) we switch to something
non-Qt-specific.
* Use QStyle::State_Horizontal state when drawing progress bars
Although available for a long time, this state either didn't apply to
progress bars before Qt 6, or was deduced based on bar size. With Qt 6,
failing to specify it results in bad rendering.
* Don't use QStringRef (and associated methods)
While still available, QStringRef has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core. Related method (e.g.
QString::midRef) have been removed in Qt 6.
* Use Qt::ItemIsAutoTristate instead of Qt::ItemIsTristate
The latter was deprecated and replaced with the former in Qt 5.6.
* Don't use QApplication::globalStrut
This property has been deprecated in Qt 5.15 and removed in Qt 6.
* Use QImage::fromHICON instead of QtWin::fromHICON
WinExtras module (providind the latter helper) has been removed in Qt 6.
* Use QStringDecoder instead of QTextCodec
While still available, QTextCodec has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core.
* Don't forward-declare QStringList
Instead of being a standalone class, its definition has changed to
QList<QString> template specialization in Qt 6.
* Use explicit (since Qt 6) QFileInfo constructor
* Use QDateTime's {to,from}SecsSinceEpoch instead of {to,from}Time_t
The latter was deprecated in Qt 5.8 and removed in Qt 6.
* Don't use QFuture<>'s operator==
It has been removed in Qt 6. Since the original issue this code was
solving was caused by future reuse, just don't reuse futures and create
new finished ones when necessary.
* Use std::vector<> instead of QVector<>
The latter has been changed to a typedef for QList<>, which might not be
what one wants, and which also changed behavior a bit leading to
compilation errors.
* Don't use + for flags, cast to int explicitly
Operator+ for enum values has been deleted in Qt 6, so using operator|
instead. Then, there's no conversion from QFlags<> to QVariant, so need
to cast to int.
* Support Qt 6 in CMake and for MSI packaging
* Remove extra (empty) CMake variable use when constructing Qt target names
* Simplify logic in tr_qt_add_translation CMake helper
Co-authored-by: Charles Kerr <charles@charleskerr.com>
2021-11-03 21:20:11 +00:00
|
|
|
if(Qt_VERSION_MAJOR EQUAL 6)
|
|
|
|
qt6_wrap_ui(${ARGN})
|
|
|
|
else()
|
|
|
|
qt5_wrap_ui(${ARGN})
|
|
|
|
endif()
|
2017-02-11 10:24:42 +00:00
|
|
|
endmacro()
|
|
|
|
|
|
|
|
macro(tr_qt_add_resources)
|
Qt 6 support (#2069)
* Bump minimum Qt version to 5.6
* Switch from QRegExp to QRegularExpression
While still available, QRegExp has been moved to Qt6::Core5Compat module
and is not part of Qt6::Core.
* Use qIsEffectiveTLD instead of QUrl::topLevelDomain
The latter is not part of Qt6::Core. The former is a private utility in
Qt6::Network; using it for now, until (and if) we switch to something
non-Qt-specific.
* Use QStyle::State_Horizontal state when drawing progress bars
Although available for a long time, this state either didn't apply to
progress bars before Qt 6, or was deduced based on bar size. With Qt 6,
failing to specify it results in bad rendering.
* Don't use QStringRef (and associated methods)
While still available, QStringRef has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core. Related method (e.g.
QString::midRef) have been removed in Qt 6.
* Use Qt::ItemIsAutoTristate instead of Qt::ItemIsTristate
The latter was deprecated and replaced with the former in Qt 5.6.
* Don't use QApplication::globalStrut
This property has been deprecated in Qt 5.15 and removed in Qt 6.
* Use QImage::fromHICON instead of QtWin::fromHICON
WinExtras module (providind the latter helper) has been removed in Qt 6.
* Use QStringDecoder instead of QTextCodec
While still available, QTextCodec has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core.
* Don't forward-declare QStringList
Instead of being a standalone class, its definition has changed to
QList<QString> template specialization in Qt 6.
* Use explicit (since Qt 6) QFileInfo constructor
* Use QDateTime's {to,from}SecsSinceEpoch instead of {to,from}Time_t
The latter was deprecated in Qt 5.8 and removed in Qt 6.
* Don't use QFuture<>'s operator==
It has been removed in Qt 6. Since the original issue this code was
solving was caused by future reuse, just don't reuse futures and create
new finished ones when necessary.
* Use std::vector<> instead of QVector<>
The latter has been changed to a typedef for QList<>, which might not be
what one wants, and which also changed behavior a bit leading to
compilation errors.
* Don't use + for flags, cast to int explicitly
Operator+ for enum values has been deleted in Qt 6, so using operator|
instead. Then, there's no conversion from QFlags<> to QVariant, so need
to cast to int.
* Support Qt 6 in CMake and for MSI packaging
* Remove extra (empty) CMake variable use when constructing Qt target names
* Simplify logic in tr_qt_add_translation CMake helper
Co-authored-by: Charles Kerr <charles@charleskerr.com>
2021-11-03 21:20:11 +00:00
|
|
|
if(Qt_VERSION_MAJOR EQUAL 6)
|
|
|
|
qt6_add_resources(${ARGN})
|
|
|
|
else()
|
|
|
|
qt5_add_resources(${ARGN})
|
|
|
|
endif()
|
2017-02-11 10:24:42 +00:00
|
|
|
endmacro()
|
|
|
|
|
|
|
|
macro(tr_qt_add_translation)
|
Qt 6 support (#2069)
* Bump minimum Qt version to 5.6
* Switch from QRegExp to QRegularExpression
While still available, QRegExp has been moved to Qt6::Core5Compat module
and is not part of Qt6::Core.
* Use qIsEffectiveTLD instead of QUrl::topLevelDomain
The latter is not part of Qt6::Core. The former is a private utility in
Qt6::Network; using it for now, until (and if) we switch to something
non-Qt-specific.
* Use QStyle::State_Horizontal state when drawing progress bars
Although available for a long time, this state either didn't apply to
progress bars before Qt 6, or was deduced based on bar size. With Qt 6,
failing to specify it results in bad rendering.
* Don't use QStringRef (and associated methods)
While still available, QStringRef has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core. Related method (e.g.
QString::midRef) have been removed in Qt 6.
* Use Qt::ItemIsAutoTristate instead of Qt::ItemIsTristate
The latter was deprecated and replaced with the former in Qt 5.6.
* Don't use QApplication::globalStrut
This property has been deprecated in Qt 5.15 and removed in Qt 6.
* Use QImage::fromHICON instead of QtWin::fromHICON
WinExtras module (providind the latter helper) has been removed in Qt 6.
* Use QStringDecoder instead of QTextCodec
While still available, QTextCodec has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core.
* Don't forward-declare QStringList
Instead of being a standalone class, its definition has changed to
QList<QString> template specialization in Qt 6.
* Use explicit (since Qt 6) QFileInfo constructor
* Use QDateTime's {to,from}SecsSinceEpoch instead of {to,from}Time_t
The latter was deprecated in Qt 5.8 and removed in Qt 6.
* Don't use QFuture<>'s operator==
It has been removed in Qt 6. Since the original issue this code was
solving was caused by future reuse, just don't reuse futures and create
new finished ones when necessary.
* Use std::vector<> instead of QVector<>
The latter has been changed to a typedef for QList<>, which might not be
what one wants, and which also changed behavior a bit leading to
compilation errors.
* Don't use + for flags, cast to int explicitly
Operator+ for enum values has been deleted in Qt 6, so using operator|
instead. Then, there's no conversion from QFlags<> to QVariant, so need
to cast to int.
* Support Qt 6 in CMake and for MSI packaging
* Remove extra (empty) CMake variable use when constructing Qt target names
* Simplify logic in tr_qt_add_translation CMake helper
Co-authored-by: Charles Kerr <charles@charleskerr.com>
2021-11-03 21:20:11 +00:00
|
|
|
if(Qt_VERSION_MAJOR EQUAL 6)
|
|
|
|
qt6_add_translation(${ARGN} OPTIONS -silent)
|
|
|
|
elseif(Qt_VERSION GREATER_EQUAL 5.11)
|
|
|
|
qt5_add_translation(${ARGN} OPTIONS -silent)
|
2020-07-29 19:53:55 +00:00
|
|
|
else()
|
Qt 6 support (#2069)
* Bump minimum Qt version to 5.6
* Switch from QRegExp to QRegularExpression
While still available, QRegExp has been moved to Qt6::Core5Compat module
and is not part of Qt6::Core.
* Use qIsEffectiveTLD instead of QUrl::topLevelDomain
The latter is not part of Qt6::Core. The former is a private utility in
Qt6::Network; using it for now, until (and if) we switch to something
non-Qt-specific.
* Use QStyle::State_Horizontal state when drawing progress bars
Although available for a long time, this state either didn't apply to
progress bars before Qt 6, or was deduced based on bar size. With Qt 6,
failing to specify it results in bad rendering.
* Don't use QStringRef (and associated methods)
While still available, QStringRef has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core. Related method (e.g.
QString::midRef) have been removed in Qt 6.
* Use Qt::ItemIsAutoTristate instead of Qt::ItemIsTristate
The latter was deprecated and replaced with the former in Qt 5.6.
* Don't use QApplication::globalStrut
This property has been deprecated in Qt 5.15 and removed in Qt 6.
* Use QImage::fromHICON instead of QtWin::fromHICON
WinExtras module (providind the latter helper) has been removed in Qt 6.
* Use QStringDecoder instead of QTextCodec
While still available, QTextCodec has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core.
* Don't forward-declare QStringList
Instead of being a standalone class, its definition has changed to
QList<QString> template specialization in Qt 6.
* Use explicit (since Qt 6) QFileInfo constructor
* Use QDateTime's {to,from}SecsSinceEpoch instead of {to,from}Time_t
The latter was deprecated in Qt 5.8 and removed in Qt 6.
* Don't use QFuture<>'s operator==
It has been removed in Qt 6. Since the original issue this code was
solving was caused by future reuse, just don't reuse futures and create
new finished ones when necessary.
* Use std::vector<> instead of QVector<>
The latter has been changed to a typedef for QList<>, which might not be
what one wants, and which also changed behavior a bit leading to
compilation errors.
* Don't use + for flags, cast to int explicitly
Operator+ for enum values has been deleted in Qt 6, so using operator|
instead. Then, there's no conversion from QFlags<> to QVariant, so need
to cast to int.
* Support Qt 6 in CMake and for MSI packaging
* Remove extra (empty) CMake variable use when constructing Qt target names
* Simplify logic in tr_qt_add_translation CMake helper
Co-authored-by: Charles Kerr <charles@charleskerr.com>
2021-11-03 21:20:11 +00:00
|
|
|
qt5_add_translation(${ARGN})
|
2020-07-29 19:53:55 +00:00
|
|
|
endif()
|
2017-02-11 10:24:42 +00:00
|
|
|
endmacro()
|