diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-02-02 14:48:42 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-02-02 15:37:14 +0100 |
| commit | 70d55fd9c738a0f9a251aca5beb7190b0fd288ef (patch) | |
| tree | bc3b3a8615088cacad53992896f1f7df1fc4142f | |
| parent | ee6b64eefef308148f3ba757184330f49b1af686 (diff) | |
| download | kshutdown-70d55fd9c738a0f9a251aca5beb7190b0fd288ef.tar.gz kshutdown-70d55fd9c738a0f9a251aca5beb7190b0fd288ef.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>
(cherry picked from commit ffbcad84f2d75202fea218e81bb9028b2a35e9c4)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kshutdown/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d24f52..f47fbf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UQT_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 |