Add QT_NO_CAST_FROM_BYTEARRAY to compile definitions

Prevents bugs like #13029, even if the ternary expression operands have different types.
4 years ago · a1809a43f8
2 changed files with 2 additions and 0 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -36,6 +36,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
				@@ -36,6 +36,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 # defines
 add_definitions(-DQT_DEPRECATED_WARNINGS)
 add_definitions(-DQT_NO_CAST_TO_ASCII)
+add_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 add_definitions(-DQT_STRICT_ITERATORS)

--- a/src/src.pro
+++ b/src/src.pro
@ -57,6 +57,7 @@ include(../version.pri)
				@@ -57,6 +57,7 @@ include(../version.pri)
 # Qt defines
 DEFINES += QT_DEPRECATED_WARNINGS
 DEFINES += QT_NO_CAST_TO_ASCII
+DEFINES += QT_NO_CAST_FROM_BYTEARRAY
 DEFINES += QT_USE_QSTRINGBUILDER
 DEFINES += QT_STRICT_ITERATORS