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>
6 years ago · ffbcad84f2
parent b7f086329b
commit ffbcad84f2
2 changed files with 2 additions and 2 deletions
--- 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" )
--- 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