most of the ASCII casts warnings have been taken care of

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a91c80a..88f6c07 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,9 +182,9 @@ add_feature_info(accessibility WITH_ACCESSIBILITY "build accessibility support")
 include(mkspecs/mkspecs.cmake)
 
 add_definitions(
-    -DQT_ASCII_CAST_WARNINGS
     -DQT_POSIX_IPC
     # -DQT_STRICT_ITERATORS
+    # -DQT_ASCII_CAST_WARNINGS
     # maybe one day, this forces it onto other projects which (most likely)
     # means source code adjustments!
     # -DQT_NO_CAST_FROM_ASCII

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a4da9d8..4185e43 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -35,9 +35,8 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtUiTools
 )
 
-# FIXME: most tests are not namespaces aware, also do not wrap ASCII chars with
-# QLatin1String and QLatin1Char
-add_definitions(-DQT_NAMESPACE_COMPAT -UQT_ASCII_CAST_WARNINGS)
+# FIXME: most tests are not namespaces aware
+add_definitions(-DQT_NAMESPACE_COMPAT)
 
 file(GLOB_RECURSE CMAKEFILES "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt")
 foreach(cmakefile ${CMAKEFILES})