Generalize QT_NO_CAST_FROM_ASCII

Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0 Reviewed-by: hjk <qthjk@ovi.com>
2013-01-12 23:29:24 +02:00
parent a31dd26e48
commit 88267a3299
102 changed files with 50 additions and 167 deletions
--- a/src/libs/qmljs/qmljs.pro
+++ b/src/libs/qmljs/qmljs.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = QmlJS
-DEFINES += QMLJS_BUILD_DIR QT_CREATOR QT_NO_CAST_FROM_ASCII
+DEFINES += QMLJS_BUILD_DIR QT_CREATOR

 QT +=script
 include(../../qtcreatorlibrary.pri)
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -7,8 +7,7 @@ QtcLibrary {
    cpp.includePaths: base.concat("parser")
    cpp.defines: base.concat([
        "QMLJS_BUILD_DIR",
-        "QT_CREATOR",
-        "QT_NO_CAST_FROM_ASCII"
+        "QT_CREATOR"
    ])
    cpp.optimization: "fast"