From 64c09a0ec1110811841883ae7260c7df447e022c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 4 Nov 2018 02:23:25 +0100
Subject: 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 <slavek.banko@axis.cz>
---
 CMakeLists.txt     | 2 +-
 src/magiclabel.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 426a862..4df15b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,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 "-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());
 }
 
 
-- 
cgit v1.2.1