napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

locale: adjust to Qt6

Browse Source
This commit is contained in:
Adriaan de Groot 2023-09-04 23:57:20 +02:00
parent 93e9990df8
commit 1b5206cb90
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/locale/CMakeLists.txt
View File

@ -18,7 +18,6 @@ calamares_add_plugin(locale
TYPE viewmodule TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES SOURCES
${geoip_src}
Config.cpp Config.cpp
LCLocaleDialog.cpp LCLocaleDialog.cpp
LocaleConfiguration.cpp LocaleConfiguration.cpp
@ -32,8 +31,7 @@ calamares_add_plugin(locale
RESOURCES RESOURCES
locale.qrc locale.qrc
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
Qt5::Network ${qtname}::Network
${geoip_libs}
yamlcpp::yamlcpp yamlcpp::yamlcpp
SHARED_LIB SHARED_LIB
) )
@ -48,5 +46,5 @@ calamares_add_test(
SetTimezoneJob.cpp SetTimezoneJob.cpp
timezonewidget/TimeZoneImage.cpp timezonewidget/TimeZoneImage.cpp
DEFINITIONS SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" DEBUG_TIMEZONES=1 DEFINITIONS SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" DEBUG_TIMEZONES=1
LIBRARIES Qt5::Gui LIBRARIES ${qtname}::Gui
) )

10
src/modules/localeq/CMakeLists.txt
View File

@ -16,10 +16,10 @@ if(DEBUG_TIMEZONES)
add_definitions(-DDEBUG_TIMEZONES) add_definitions(-DDEBUG_TIMEZONES)
endif() endif()
find_package(Qt5Location CONFIG) find_package(${qtname}Location CONFIG)
set_package_properties(Qt5Location PROPERTIES DESCRIPTION "Used for rendering the map" TYPE RUNTIME) set_package_properties(${qtname}Location PROPERTIES DESCRIPTION "Used for rendering the map" TYPE RUNTIME)
find_package(Qt5Positioning CONFIG) find_package(${qtname}Positioning CONFIG)
set_package_properties(Qt5Positioning PROPERTIES DESCRIPTION "Used for GeoLocation and GeoCoding" TYPE RUNTIME) set_package_properties(${qtname}Positioning PROPERTIES DESCRIPTION "Used for GeoLocation and GeoCoding" TYPE RUNTIME)
# Because we're sharing sources with the regular locale module # Because we're sharing sources with the regular locale module
set(_locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale) set(_locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale)
@ -38,6 +38,6 @@ calamares_add_plugin(localeq
RESOURCES RESOURCES
localeq.qrc localeq.qrc
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
Qt5::Network ${qtname}::Network
SHARED_LIB SHARED_LIB
) )