diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-11-04 02:23:25 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-11-04 04:21:58 +0100 |
| commit | f971d07fa3ac7f9390bff42109880d65167a724f (patch) | |
| tree | 9dc754f7dcd36a49bdba59cc38b77c245bd6a180 | |
| parent | 0b2c4d9d78db599b2232cbdf79b8dc0eb1412182 (diff) | |
| download | ksplash-engine-moodin-f971d07fa3ac7f9390bff42109880d65167a724f.tar.gz ksplash-engine-moodin-f971d07fa3ac7f9390bff42109880d65167a724f.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 64c09a0ec1110811841883ae7260c7df447e022c)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/magiclabel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5497fc6..4df15b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,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 "-Wl,--no-undefined" ) diff --git a/src/magiclabel.cpp b/src/magiclabel.cpp index 0613720..b22461d 100644 --- a/src/magiclabel.cpp +++ b/src/magiclabel.cpp @@ -31,7 +31,7 @@ MagicLabel::MagicLabel(TQString s, bool translate) transform(); if (translate) - mValue = i18n(mValue); + mValue = i18n(mValue.utf8()); } |