Commit fa1c532b authored by Nicolas Fella's avatar Nicolas Fella Committed by Albert Astals Cid
Browse files

Port from I18n_NOOP to KLazyLocalizedString

parent 77d9ce8c
Pipeline #167897 passed with stage
in 52 seconds
......@@ -9,8 +9,9 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project(kgeography VERSION ${RELEASE_SERVICE_VERSION})
# minimal Qt requirement
set(QT_MIN_VERSION "5.12.0") # Remember to update the QT_DEPRECATED_WARNINGS_SINCE below
set(KF5_REQUIRED_VERSION "5.68.0") # Remember to update the KF_DEPRECATED_WARNINGS_SINCE below
set(QT_MIN_VERSION "5.15.2") # Remember to update the QT_DEPRECATED_WARNINGS_SINCE below
set(KF5_REQUIRED_VERSION "5.89.0") # Remember to update the KF_DEPRECATED_WARNINGS_SINCE below
set(KDE_COMPILERSETTINGS_LEVEL "5.82.0")
# ECM
find_package (ECM ${KF5_REQUIRED_VERSION} REQUIRED NO_MODULE)
......@@ -34,8 +35,8 @@ include(ECMSetupVersion)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x050C00)
add_definitions(-DKF_DEPRECATED_WARNINGS_SINCE=0x054400)
add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x050F02)
add_definitions(-DKF_DEPRECATED_WARNINGS_SINCE=0x055900)
# global include directories
include_directories (${CMAKE_CURRENT_BINARY_DIR})
......
......@@ -15,11 +15,12 @@
#include <QFileInfo>
#include <QRandomGenerator>
#include <KLazyLocalizedString>
KGmap::KGmap()
{
p_capitalToDivisionPattern = I18N_NOOP2("@title:group", "%1 is the capital of...");
p_divisionToCapitalPattern = I18N_NOOP2("@title:group", "The capital of %1 is...");
p_capitalToDivisionPattern = kli18nc("@title:group", "%1 is the capital of...").untranslatedText();
p_divisionToCapitalPattern = kli18nc("@title:group", "The capital of %1 is...").untranslatedText();
}
KGmap::~KGmap()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment