summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-02-02 14:48:42 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-02-02 14:48:42 +0100
commitffbcad84f2d75202fea218e81bb9028b2a35e9c4 (patch)
tree91a5da8a8c85ae4bf661188f034a04f56835f4bd
parentb7f086329b82f93c9e3c492cdeb94a5114630dab (diff)
downloadkshutdown-ffbcad84.tar.gz
kshutdown-ffbcad84.zip
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--CMakeLists.txt2
-rw-r--r--kshutdown/main.cpp2
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