summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-04-24 17:10:08 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-04-24 19:36:18 +0000
commitd61502a4482989acda10e23589a15fb866975c76 (patch)
treef412c991be0689a83bf7638374352043d88b59a7 /mkspecs
parent21dd5d314a75c09250448e5d59dfb9af88c0f7d5 (diff)
Undefine QT_RESTRICTED_CAST_FROM_ASCII for headersclean build step
The module might add QT_RESTRICTED_CAST_FROM_ASCII to DEFINES to be able to use string literals under the assumption they are UTF8 without warnings from QT_ASCII_CAST_WARN, but this conflicts with QT_NO_CAST_FROM_ASCII which is added for the headersclean build step. Change-Id: Ic1d7b5415350477d751a6c15219d4f8feb816a3c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_module_headers.prf1
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index c77db2193b..8837410b8d 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -174,6 +174,7 @@ headersclean:!internal_module {
# Make sure that the header compiles with our strict options
hcleanDEFS = -DQT_NO_CAST_TO_ASCII=1 \
-DQT_NO_CAST_FROM_ASCII=1 \
+ -UQT_RESTRICTED_CAST_FROM_ASCII \
-DQT_STRICT_ITERATORS \
-DQT_NO_URL_CAST_FROM_STRING=1 \
-DQT_NO_CAST_FROM_BYTEARRAY=1 \