From ffbcad84f2d75202fea218e81bb9028b2a35e9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 2 Feb 2019 14:48:42 +0100 Subject: [PATCH] Added controlled conversions to char* instead of automatic ascii conversions. The definition of -UTQT_NO_ASCII_CAST is no longer needed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 2 +- kshutdown/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c30f1b..f47fbf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST ) +add_definitions( -DHAVE_CONFIG_H ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/kshutdown/main.cpp b/kshutdown/main.cpp index 098882a..aa9a1bf 100644 --- a/kshutdown/main.cpp +++ b/kshutdown/main.cpp @@ -39,7 +39,7 @@ TQString version = "1.0.4"; TDEAboutData aboutData( "kshutdown", // internal name "KShutDown", // full name - version, + version.utf8(), I18N_NOOP("A Shut Down Utility for TDE"), // description TDEAboutData::License_GPL_V2, // license "(C) 2003-3000 Konrad Twardowski", // copyright