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/plugins/qmljseditor/qmljseditor.pro
+++ b/src/plugins/qmljseditor/qmljseditor.pro
@@ -6,8 +6,7 @@ QT += script

 DEFINES += \
    QMLJSEDITOR_LIBRARY \
-    QT_CREATOR \
-    QT_NO_CAST_FROM_ASCII
+    QT_CREATOR

 HEADERS += \
    qmljseditor.h \
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -17,7 +17,7 @@ QtcPlugin {
    Depends { name: "CPlusPlus" }

    Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_CREATOR", "QT_NO_CAST_FROM_ASCII"])
+    cpp.defines: base.concat("QT_CREATOR")

    files: [
        "QmlJSEditor.mimetypes.xml",