瀏覽代碼

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>
pull/1/head
Slávek Banko 8 月之前
父節點
當前提交
64c09a0ec1
簽署人: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1
    1
      CMakeLists.txt
  2. 1
    1
      src/magiclabel.cpp

+ 1
- 1
CMakeLists.txt 查看文件

@@ -56,7 +56,7 @@ include( ConfigureChecks.cmake )
56 56
 
57 57
 ###### global compiler settings
58 58
 
59
-add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
59
+add_definitions( -DHAVE_CONFIG_H )
60 60
 
61 61
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
62 62
 set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )

+ 1
- 1
src/magiclabel.cpp 查看文件

@@ -31,7 +31,7 @@ MagicLabel::MagicLabel(TQString s, bool translate)
31 31
   transform();
32 32
 
33 33
   if (translate)
34
-    mValue = i18n(mValue);
34
+    mValue = i18n(mValue.utf8());
35 35
 }
36 36
 
37 37
 

Loading…
取消
儲存