diff options
| -rw-r--r-- | qtcreator.pri | 2 | ||||
| -rw-r--r-- | qtcreator.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 3447d8ce71..073c048278 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -150,7 +150,7 @@ exists($$IDE_LIBRARY_PATH): LIBS *= -L$$IDE_LIBRARY_PATH # library path from ou DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" } -DEFINES += QT_CREATOR QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII +DEFINES += QT_CREATOR QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII !macx:DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION unix { diff --git a/qtcreator.qbs b/qtcreator.qbs index cafc911189..d1bb6d7759 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -56,7 +56,7 @@ Project { "QT_CREATOR", 'IDE_LIBRARY_BASENAME="' + libDirName + '"', "QT_NO_CAST_TO_ASCII", - "QT_NO_CAST_FROM_ASCII" + "QT_RESTRICTED_CAST_FROM_ASCII" ].concat(testsEnabled ? ["WITH_TESTS"] : []) qbsSearchPaths: "qbs" |