Generalize QT_NO_CAST_FROM_ASCII

Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>

qbs/defaults.js

@@ -8,7 +8,8 @@ function defines(qbs)
     var list = [
         'IDE_LIBRARY_BASENAME="lib"',
         "QT_DISABLE_DEPRECATED_BEFORE=0x040900",
-        "QT_NO_CAST_TO_ASCII"
+        "QT_NO_CAST_TO_ASCII",
+        "QT_NO_CAST_FROM_ASCII"
     ]
     if (testsEnabled(qbs))
         list.push("WITH_TESTS")

qtcreator.pri

@@ -162,8 +162,7 @@ LIBS += -L$$IDE_LIBRARY_PATH
     DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
 }
 
-#DEFINES += QT_NO_CAST_FROM_ASCII
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-DEFINES += QT_NO_CAST_TO_ASCII
 !macx:DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
 
 unix {

share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri

@@ -21,6 +21,7 @@ QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
 
 SOURCES +=  $$PWD/main.cpp
 RESOURCES +=  $$PWD/../qmlpuppet.qrc
+DEFINES -= QT_NO_CAST_FROM_ASCII
 
 OTHER_FILES += Info.plist.in
 macx {

share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri

@@ -19,6 +19,7 @@ include (../interfaces/interfaces.pri)
 
 SOURCES += $$PWD/main.cpp
 RESOURCES += $$PWD/../qmlpuppet.qrc
+DEFINES -= QT_NO_CAST_FROM_ASCII
 
 OTHER_FILES += Info.plist.in
 macx {

src/libs/aggregation/aggregation.pro

@@ -3,7 +3,7 @@ TARGET = Aggregation
 
 include(../../qtcreatorlibrary.pri)
 
-DEFINES += AGGREGATION_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += AGGREGATION_LIBRARY
 
 HEADERS = aggregate.h \
     aggregation_global.h

src/libs/aggregation/aggregation.qbs

@@ -4,9 +4,9 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "Aggregation"
 
-    cpp.defines: base.concat(["AGGREGATION_LIBRARY", "QT_NO_CAST_FROM_ASCII"])
     Depends { name: "cpp" }
     Depends { name: "Qt.core" }
+    cpp.defines: base.concat("AGGREGATION_LIBRARY")
 
     files: [
         "aggregate.cpp",

src/libs/cplusplus/cplusplus-lib.pri

@@ -10,8 +10,6 @@ include(../3rdparty/cplusplus/cplusplus.pri)
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 contains(QT, gui) {
 HEADERS += \
     $$PWD/Icons.h \

src/libs/cplusplus/cplusplus.qbs

@@ -7,8 +7,7 @@ QtcLibrary {
     cpp.includePaths: base.concat("../3rdparty/cplusplus")
     cpp.defines: base.concat([
         "NDEBUG",
-        "CPLUSPLUS_BUILD_LIB",
+        "CPLUSPLUS_BUILD_LIB"
-        "QT_NO_CAST_FROM_ASCII"
     ])
     cpp.optimization: "fast"
 

src/libs/extensionsystem/extensionsystem.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = ExtensionSystem
-DEFINES += EXTENSIONSYSTEM_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += EXTENSIONSYSTEM_LIBRARY
 include(../../qtcreatorlibrary.pri)
 include(extensionsystem_dependencies.pri)
 

src/libs/extensionsystem/extensionsystem.qbs

@@ -6,8 +6,7 @@ QtcLibrary {
 
     cpp.defines: base.concat([
         "EXTENSIONSYSTEM_LIBRARY",
-        "IDE_TEST_DIR=\".\"",
+        "IDE_TEST_DIR=\".\""
-        "QT_NO_CAST_FROM_ASCII"
     ])
 
     Depends { name: "cpp" }

src/libs/glsl/glsl.pro

@@ -2,8 +2,7 @@ TEMPLATE = lib
 TARGET = GLSL
 DEFINES += \
     GLSL_BUILD_LIB \
-    QT_CREATOR \
+    QT_CREATOR
-    QT_NO_CAST_FROM_ASCII
 
 include(../../qtcreatorlibrary.pri)
 include(glsl-lib.pri)

src/libs/glsl/glsl.qbs

@@ -6,8 +6,7 @@ QtcLibrary {
 
     cpp.defines: base.concat([
         "QT_CREATOR",
-        "GLSL_BUILD_LIB",
+        "GLSL_BUILD_LIB"
-        "QT_NO_CAST_FROM_ASCII"
     ])
 
     Depends { name: "cpp" }

src/libs/languageutils/languageutils.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = LanguageUtils
-DEFINES += QT_CREATOR QT_NO_CAST_FROM_ASCII
+DEFINES += QT_CREATOR
 
 unix:QMAKE_CXXFLAGS_DEBUG += -O3
 

src/libs/languageutils/languageutils.qbs

@@ -7,8 +7,7 @@ QtcLibrary {
     cpp.includePaths: base.concat("../3rdparty/cplusplus")
     cpp.defines: base.concat([
         "QT_CREATOR",
-        "LANGUAGEUTILS_BUILD_DIR",
+        "LANGUAGEUTILS_BUILD_DIR"
-        "QT_NO_CAST_FROM_ASCII"
     ])
     cpp.optimization: "fast"
 

src/libs/qmldebug/qmldebug.pro

@@ -5,8 +5,6 @@ QT += network
 include(../../qtcreatorlibrary.pri)
 include(qmldebug-lib.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 OTHER_FILES += \
     qmldebug.pri
 

src/libs/qmldebug/qmldebug.qbs

@@ -4,10 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "QmlDebug"
 
-    cpp.defines: base.concat([
+    cpp.defines: base.concat("QMLDEBUG_LIB")
-        "QMLDEBUG_LIB",
-        "QT_NO_CAST_FROM_ASCII"
-    ])
 
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["gui", "network"] }

src/libs/qmleditorwidgets/qmleditorwidgets.pro

@@ -1,7 +1,7 @@
 TEMPLATE = lib
 TARGET = QmlEditorWidgets
 
-DEFINES += QWEAKPOINTER_ENABLE_ARROW QT_NO_CAST_FROM_ASCII
+DEFINES += QWEAKPOINTER_ENABLE_ARROW
 
 unix:QMAKE_CXXFLAGS_DEBUG += -O3
 

src/libs/qmleditorwidgets/qmleditorwidgets.qbs

@@ -8,8 +8,7 @@ QtcLibrary {
     cpp.defines: base.concat([
         "QWEAKPOINTER_ENABLE_ARROW",
         "BUILD_QMLEDITORWIDGETS_LIB",
-        "QT_CREATOR",
+        "QT_CREATOR"
-        "QT_NO_CAST_FROM_ASCII"
     ])
     cpp.optimization: "fast"
 

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)

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_CREATOR"
-        "QT_NO_CAST_FROM_ASCII"
     ])
     cpp.optimization: "fast"
 

src/libs/utils/utils-lib.pri

@@ -9,8 +9,6 @@ QT += script network
 
 CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/*
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 win32-msvc* {
     # disable warnings caused by botan headers
     QMAKE_CXXFLAGS += -wd4250 -wd4290

src/libs/utils/utils.qbs

@@ -4,7 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "Utils"
 
-    cpp.defines: base.concat(["QTCREATOR_UTILS_LIB", "QT_NO_CAST_FROM_ASCII"])
+    cpp.defines: base.concat("QTCREATOR_UTILS_LIB")
 
     Properties {
         condition: qbs.targetOS == "windows"

src/libs/zeroconf/zeroconf.pro

@@ -5,7 +5,7 @@ CONFIG   += exceptions
 TARGET = zeroconf
 TEMPLATE = lib
 
-DEFINES += ZEROCONF_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += ZEROCONF_LIBRARY
 
 SOURCES += servicebrowser.cpp \
     embeddedLib.cpp \

src/libs/zeroconf/zeroconf.qbs

@@ -8,7 +8,7 @@ QtcLibrary {
     Depends { name: "Qt.network" }
     cpp.includePaths: base.concat(".")
 
-    cpp.defines: base.concat(["ZEROCONF_LIBRARY", "QT_NO_CAST_FROM_ASCII"])
+    cpp.defines: base.concat("ZEROCONF_LIBRARY")
 
     Properties {
         condition: qbs.targetOS == "windows"

src/plugins/analyzerbase/analyzerbase.pro

@@ -1,7 +1,7 @@
 TEMPLATE = lib
 TARGET = AnalyzerBase
 
-DEFINES += ANALYZER_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += ANALYZER_LIBRARY
 
 include(../../qtcreatorplugin.pri)
 include(analyzerbase_dependencies.pri)

src/plugins/analyzerbase/analyzerbase.qbs

@@ -13,10 +13,7 @@ QtcPlugin {
     Depends { name: "TextEditor" }
 
     Depends { name: "cpp" }
-    cpp.defines: base.concat([
+    cpp.defines: base.concat("ANALYZER_LIBRARY")
-        "ANALYZER_LIBRARY",
-        "QT_NO_CAST_FROM_ASCII"
-    ])
 
     files: [
         "analyzerbase.qrc",

src/plugins/android/android.pro

@@ -76,5 +76,4 @@ FORMS += \
     androidcreatekeystorecertificate.ui
 
 RESOURCES = android.qrc
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 DEFINES += ANDROID_LIBRARY

src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro

@@ -1,7 +1,6 @@
 TEMPLATE = lib
 TARGET = AutotoolsProjectManager
 #PROVIDER = Openismus
-DEFINES += QT_NO_CAST_FROM_ASCII
 
 include(../../qtcreatorplugin.pri)
 include(autotoolsprojectmanager_dependencies.pri)

src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs

@@ -11,9 +11,6 @@ QtcPlugin {
     Depends { name: "QtSupport" }
     Depends { name: "CppTools" }
 
-    Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-
     files: [
         "autogenstep.cpp",
         "autogenstep.h",

src/plugins/bazaar/bazaar.pro

@@ -2,7 +2,6 @@ TARGET = Bazaar
 TEMPLATE = lib
 include(../../qtcreatorplugin.pri)
 include(bazaar_dependencies.pri)
-DEFINES += QT_NO_CAST_FROM_ASCII
 SOURCES += \
     bazaarclient.cpp \
     bazaarcontrol.cpp \

src/plugins/bineditor/bineditor.pro

@@ -3,8 +3,6 @@ TARGET = BinEditor
 include(../../qtcreatorplugin.pri)
 include(bineditor_dependencies.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += bineditorplugin.h \
         bineditor.h \
         bineditorconstants.h \

src/plugins/bineditor/bineditor.qbs

@@ -10,9 +10,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "Find" }
 
-    Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-
     files: [
         "bineditor.cpp",
         "bineditor.h",

src/plugins/bookmarks/bookmarks.pro

@@ -6,8 +6,6 @@ include(../../plugins/projectexplorer/projectexplorer.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/texteditor/texteditor.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += bookmarksplugin.h \
            bookmark.h \
            bookmarkmanager.h \

src/plugins/bookmarks/bookmarks.qbs

@@ -12,9 +12,6 @@ QtcPlugin {
     Depends { name: "Find" }
     Depends { name: "Locator" }
 
-    Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-
     files: [
         "bookmark.cpp",
         "bookmark.h",

src/plugins/clearcase/clearcase.pro

@@ -5,8 +5,6 @@ TARGET = ClearCase
 include(../../qtcreatorplugin.pri)
 include(clearcase_dependencies.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += activityselector.h \
     annotationhighlighter.h \
     checkoutdialog.h \

src/plugins/clearcase/clearcase.qbs

@@ -16,9 +16,6 @@ QtcPlugin {
     Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
-    Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-
     files: [
         "activityselector.cpp",
         "activityselector.h",

src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro

@@ -4,8 +4,6 @@ TARGET = CMakeProjectManager
 include(../../qtcreatorplugin.pri)
 include(cmakeprojectmanager_dependencies.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS = cmakeproject.h \
     cmakeprojectplugin.h \
     cmakeprojectmanager.h \

src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs

@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "CMakeProjectManager"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "CppTools" }
@@ -14,7 +13,6 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
     Depends { name: "QtSupport" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "CMakeProject.mimetypes.xml",
@@ -52,4 +50,3 @@ QtcPlugin {
         "makestep.h",
     ]
 }
-

src/plugins/coreplugin/coreplugin.pro

@@ -1,7 +1,6 @@
 TEMPLATE = lib
 TARGET = Core
-DEFINES += CORE_LIBRARY \
+DEFINES += CORE_LIBRARY
-    QT_NO_CAST_FROM_ASCII
 QT += network \
     script \
     sql

src/plugins/coreplugin/coreplugin.qbs

@@ -32,7 +32,6 @@ QtcPlugin {
         ]
     }
 
-    cpp.defines: base.concat([ "QT_NO_CAST_FROM_ASCII" ])
     files: [
         "basefilewizard.cpp",
         "basefilewizard.h",

src/plugins/cpaster/cpaster.pro

@@ -3,7 +3,6 @@ TEMPLATE = lib
 TARGET = CodePaster
 include(../../qtcreatorplugin.pri)
 include(cpaster_dependencies.pri)
-DEFINES += QT_NO_CAST_FROM_ASCII
 HEADERS += cpasterplugin.h \
     settingspage.h \
     protocol.h \

src/plugins/cppeditor/cppeditor.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = CppEditor
-DEFINES += CPPEDITOR_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += CPPEDITOR_LIBRARY
 include(../../qtcreatorplugin.pri)
 include(cppeditor_dependencies.pri)
 HEADERS += cppplugin.h \

src/plugins/cppeditor/cppeditor.qbs

@@ -14,7 +14,6 @@ QtcPlugin {
     Depends { name: "cpp" }
 
     cpp.includePaths: base.concat("../../libs/3rdparty")
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "CppEditor.mimetypes.xml",

src/plugins/cpptools/cpptools.pro

@@ -4,7 +4,6 @@ include(../../qtcreatorplugin.pri)
 include($$IDE_SOURCE_TREE/src/plugins/locator/locator.pri)
 include(cpptools_dependencies.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
 INCLUDEPATH += .
 DEFINES += CPPTOOLS_LIBRARY
 HEADERS += completionsettingspage.h \

src/plugins/cpptools/cpptools.qbs

@@ -16,9 +16,6 @@ QtcPlugin {
     Depends { name: "CPlusPlus" }
     Depends { name: "LanguageUtils" }
 
-    Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-
     files: [
         "ModelManagerInterface.cpp",
         "ModelManagerInterface.h",

src/plugins/cvs/cvs.pro

@@ -8,7 +8,6 @@ include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/vcsbase/vcsbase.pri)
 include(../../libs/utils/utils.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
 HEADERS += annotationhighlighter.h \
     cvsplugin.h \
     cvscontrol.h \

src/plugins/debugger/debugger.pro

@@ -8,7 +8,7 @@ TARGET = Debugger
 include(../../qtcreatorplugin.pri)
 include(debugger_dependencies.pri)
 
-DEFINES += DEBUGGER_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += DEBUGGER_LIBRARY
 
 INCLUDEPATH += $$PWD/../../libs/utils
 

src/plugins/debugger/debugger.qbs

@@ -26,7 +26,6 @@ QtcPlugin {
         "../../shared/json",
         "../../shared/registryaccess"
     ])
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     Group {
         condition: Defaults.testsEnabled(qbs)

src/plugins/designer/designer.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = Designer
-DEFINES += DESIGNER_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += DESIGNER_LIBRARY
 
 include(../../qtcreatorplugin.pri)
 include(../../shared/designerintegrationv2/designerintegration.pri)

src/plugins/fakevim/fakevim.pro

@@ -7,7 +7,6 @@ include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/texteditor/texteditor.pri)
 include(../../plugins/find/find.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
 QT += gui
 SOURCES += fakevimactions.cpp \
     fakevimhandler.cpp \

src/plugins/fakevim/fakevim.qbs

@@ -10,9 +10,7 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "Find" }
     Depends { name: "Qt.widgets" }
-    Depends { name: "cpp" }
 
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
     files: [
         "fakevimactions.cpp",
         "fakevimactions.h",

src/plugins/genericprojectmanager/genericprojectmanager.pro

@@ -3,8 +3,6 @@ TARGET = GenericProjectManager
 include(../../qtcreatorplugin.pri)
 include(genericprojectmanager_dependencies.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS = genericproject.h \
     genericprojectplugin.h \
     genericprojectmanager.h \

src/plugins/genericprojectmanager/genericprojectmanager.qbs

@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "GenericProjectManager"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "CPlusPlus" }
@@ -15,7 +14,6 @@ QtcPlugin {
     Depends { name: "Find" }
     Depends { name: "Locator" }
     Depends { name: "QtSupport" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "filesselectionwizardpage.cpp",

src/plugins/git/git.pro

@@ -1,6 +1,5 @@
 TEMPLATE = lib
 TARGET = Git
-DEFINES += QT_NO_CAST_FROM_ASCII
 include(../../qtcreatorplugin.pri)
 include(../../plugins/projectexplorer/projectexplorer.pri)
 include(../../plugins/texteditor/texteditor.pri)

src/plugins/git/git.qbs

@@ -12,9 +12,6 @@ QtcPlugin {
     Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
-    Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-
     files: [
         "annotationhighlighter.cpp",
         "annotationhighlighter.h",

src/plugins/glsleditor/glsleditor.pro

@@ -5,8 +5,7 @@ include(glsleditor_dependencies.pri)
 
 DEFINES += \
     GLSLEDITOR_LIBRARY \
-    QT_CREATOR \
+    QT_CREATOR
-    QT_NO_CAST_FROM_ASCII
 
 HEADERS += \
 glsleditor.h \

src/plugins/glsleditor/glsleditor.qbs

@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "GLSLEditor"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
@@ -13,7 +12,6 @@ QtcPlugin {
     Depends { name: "CppTools" }
     Depends { name: "GLSL" }
     Depends { name: "CPlusPlus" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "GLSLEditor.mimetypes.xml",

src/plugins/help/help.pro

@@ -18,8 +18,7 @@ include(help_dependencies.pri)
 
 DEFINES += \
     QT_CLUCENE_SUPPORT \
-    HELP_LIBRARY \
+    HELP_LIBRARY
-    QT_NO_CAST_FROM_ASCII
 
 HEADERS += \
     centralwidget.h \

src/plugins/help/help.qbs

@@ -25,7 +25,7 @@ QtcPlugin {
         condition: qtcore.versionMajor >= 5
         cpp.defines: base.concat(["QT_NO_WEBKIT"])
     }
-    cpp.defines: base.concat(["QT_CLUCENE_SUPPORT", "QT_NO_CAST_FROM_ASCII"])
+    cpp.defines: base.concat("QT_CLUCENE_SUPPORT")
     cpp.includePaths: base.concat("../../shared/help")
 
     files: [

src/plugins/imageviewer/imageviewer.pro

@@ -3,8 +3,6 @@ TARGET = ImageViewer
 include(../../qtcreatorplugin.pri)
 include(imageviewer_dependencies.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += \
     imageviewerplugin.h \
     imageviewerfactory.h \

src/plugins/imageviewer/imageviewer.qbs

@@ -5,10 +5,8 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "ImageViewer"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["widgets", "svg"] }
     Depends { name: "Core" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "ImageViewer.mimetypes.xml",

src/plugins/locator/locator.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = Locator
-DEFINES += LOCATOR_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += LOCATOR_LIBRARY
 include(../../qtcreatorplugin.pri)
 include(locator_dependencies.pri)
 HEADERS += locatorplugin.h \

src/plugins/locator/locator.qbs

@@ -16,7 +16,6 @@ QtcPlugin {
         "codeassist"
     ])
 
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
     files: [
         "basefilefilter.cpp",
         "basefilefilter.h",

src/plugins/macros/macros.pro

@@ -1,7 +1,7 @@
 TEMPLATE = lib
 TARGET = Macros
 
-DEFINES += MACROS_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += MACROS_LIBRARY
 
 include(../../qtcreatorplugin.pri)
 include(macros_dependencies.pri)

src/plugins/macros/macros.qbs

@@ -5,14 +5,12 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "Macros"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "Locator" }
     Depends { name: "Find" }
     Depends { name: "TextEditor" }
     Depends { name: "app_version_header" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "actionmacrohandler.cpp",

src/plugins/madde/madde.pro

@@ -108,4 +108,4 @@ FORMS += \
     maemodeviceconfigwizardkeydeploymentpage.ui
 
 RESOURCES += qt-maemo.qrc
-DEFINES += MADDE_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += MADDE_LIBRARY

src/plugins/madde/madde.qbs

@@ -12,9 +12,6 @@ QtcPlugin {
     Depends { name: "RemoteLinux" }
     Depends { name: "Qt.gui" }
 
-    Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-
     files: [
         "debianmanager.cpp",
         "debianmanager.h",

src/plugins/mercurial/mercurial.pro

@@ -2,7 +2,6 @@ TARGET = Mercurial
 TEMPLATE = lib
 include(../../qtcreatorplugin.pri)
 include(mercurial_dependencies.pri)
-DEFINES += QT_NO_CAST_FROM_ASCII
 SOURCES += mercurialplugin.cpp \
     optionspage.cpp \
     mercurialcontrol.cpp \

src/plugins/perforce/perforce.pro

@@ -4,8 +4,6 @@ TARGET = Perforce
 include(../../qtcreatorplugin.pri)
 include(perforce_dependencies.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += \
     perforceplugin.h \
     perforcechecker.h \

src/plugins/projectexplorer/projectexplorer.pro

@@ -287,4 +287,4 @@ RESOURCES += projectexplorer.qrc
     DEFINES += QTC_CPU=X86Architecture
 }
 
-DEFINES += PROJECTEXPLORER_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += PROJECTEXPLORER_LIBRARY

src/plugins/projectexplorer/projectexplorer.qbs

@@ -14,7 +14,7 @@ QtcPlugin {
     Depends { name: "QtcSsh" }
 
     Depends { name: "cpp" }
-    cpp.defines: base.concat(["QTC_CPU=X86Architecture", "QT_NO_CAST_FROM_ASCII"])
+    cpp.defines: base.concat("QTC_CPU=X86Architecture")
     cpp.includePaths: base.concat([
         "customwizard",
         "publishing"

src/plugins/qmldesigner/designercore/iwidgetplugin.pri

@@ -1 +1,2 @@
 INCLUDEPATH += $$PWD/include
+DEFINES -= QT_NO_CAST_FROM_ASCII

src/plugins/qmldesigner/qmldesignerplugin.pro

@@ -20,3 +20,5 @@ include(components/pluginmanager/pluginmanager.pri)
 include(components/stateseditor/stateseditor.pri)
 include(components/resources/resources.pri)
 include(qmldesignerplugin.pri)
+
+DEFINES -= QT_NO_CAST_FROM_ASCII

src/plugins/qmljseditor/qmljseditor.pro

@@ -6,8 +6,7 @@ QT += script
 
 DEFINES += \
     QMLJSEDITOR_LIBRARY \
-    QT_CREATOR \
+    QT_CREATOR
-    QT_NO_CAST_FROM_ASCII
 
 HEADERS += \
     qmljseditor.h \

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",

src/plugins/qmljstools/qmljstools.pro

@@ -3,7 +3,6 @@ TARGET = QmlJSTools
 include(../../qtcreatorplugin.pri)
 include(qmljstools_dependencies.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
 DEFINES += QMLJSTOOLS_LIBRARY
 
 !dll {

src/plugins/qmljstools/qmljstools.qbs

@@ -18,7 +18,6 @@ QtcPlugin {
     Depends { name: "QtSupport" }
 
     Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
     cpp.includePaths: base.concat("../../libs/3rdparty")
 
     files: [

src/plugins/qmlprofiler/qmlprofiler.pro

@@ -1,7 +1,7 @@
 TEMPLATE = lib
 TARGET = QmlProfiler
 
-DEFINES += QMLPROFILER_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += QMLPROFILER_LIBRARY
 
 QT += network script declarative
 

src/plugins/qmlprofiler/qmlprofiler.qbs

@@ -21,7 +21,6 @@ QtcPlugin {
 
     Depends { name: "cpp" }
     cpp.includePaths: base.concat("canvas")
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "abstractqmlprofilerrunner.h",

src/plugins/qmlprojectmanager/qmlprojectmanager.pro

@@ -7,7 +7,7 @@ include(../../qtcreatorplugin.pri)
 include(qmlprojectmanager_dependencies.pri)
 include(fileformat/fileformat.pri)
 
-DEFINES += QMLPROJECTMANAGER_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += QMLPROJECTMANAGER_LIBRARY
 HEADERS += qmlproject.h \
     qmlprojectplugin.h \
     qmlprojectmanager.h \

src/plugins/qmlprojectmanager/qmlprojectmanager.qbs

@@ -15,7 +15,7 @@ QtcPlugin {
     Depends { name: "Debugger" }
     Depends { name: "QtSupport" }
     Depends { name: "app_version_header" }
-    cpp.defines: base.concat(["QMLPROJECTMANAGER_LIBRARY", "QT_NO_CAST_FROM_ASCII"])
+    cpp.defines: base.concat("QMLPROJECTMANAGER_LIBRARY")
 
     files: [
         "qmlapp.cpp",

src/plugins/qnx/qnx.pro

@@ -112,7 +112,5 @@ FORMS += \
     qnxbaseqtconfigwidget.ui \
     bardescriptorfileimagewizardpage.ui
 
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
 RESOURCES += \
     qnx.qrc

src/plugins/qnx/qnx.qbs

@@ -14,7 +14,6 @@ QtcPlugin {
     Depends { name: "RemoteLinux" }
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
-    cpp.defines: base.concat(["QT_NO_CAST_TO_ASCII", "QT_NO_CAST_FROM_ASCII"])
     cpp.includePaths: base.concat("../../shared")
 
     files: [

src/plugins/qt4projectmanager/qt4projectmanager.pro

@@ -6,8 +6,7 @@ include(qt4projectmanager_dependencies.pri)
 
 DEFINES += \
     QT_CREATOR \
-    QT4PROJECTMANAGER_LIBRARY \
+    QT4PROJECTMANAGER_LIBRARY
-    QT_NO_CAST_FROM_ASCII
 
 HEADERS += \
     qmakekitinformation.h \

src/plugins/qt4projectmanager/qt4projectmanager.qbs

@@ -20,8 +20,7 @@ QtcPlugin {
         "PROPARSER_AS_LIBRARY",
         "PROPARSER_THREAD_SAFE",
         "PROEVALUATOR_THREAD_SAFE",
-        "PROEVALUATOR_CUMULATIVE",
+        "PROEVALUATOR_CUMULATIVE"
-        "QT_NO_CAST_FROM_ASCII"
     ])
     cpp.includePaths: base.concat([
         "customwidgetwizard",

src/plugins/qtsupport/qtsupport.pro

@@ -61,6 +61,3 @@ FORMS   +=  \
     qtversioninfo.ui \
     debugginghelper.ui \
     qtversionmanager.ui \
-
-
-DEFINES += QT_NO_CAST_FROM_ASCII

src/plugins/qtsupport/qtsupport.qbs

@@ -18,8 +18,6 @@ QtcPlugin {
     ])
 
     cpp.defines: base.concat([
-        "QT_NO_CAST_FROM_ASCII",
-        "QT_NO_CAST_TO_ASCII",
         "QMAKE_AS_LIBRARY",
         "QMAKE_LIBRARY",
         "PROPARSER_THREAD_SAFE",

src/plugins/remotelinux/remotelinux.pro

@@ -100,6 +100,4 @@ FORMS += \
 
 RESOURCES += remotelinux.qrc
 
-DEFINES += \
+DEFINES += REMOTELINUX_LIBRARY
-    REMOTELINUX_LIBRARY \
-    QT_NO_CAST_FROM_ASCII

src/plugins/remotelinux/remotelinux.qbs

@@ -12,7 +12,7 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "QtSupport" }
     Depends { name: "QtcSsh" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
+    cpp.defines: base.concat("REMOTELINUX_LIBRARY")
 
     files: [
         "abstractpackagingstep.cpp",

src/plugins/resourceeditor/resourceeditor.pro

@@ -1,8 +1,6 @@
 TEMPLATE = lib
 TARGET = ResourceEditor
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 include(../../qtcreatorplugin.pri)
 include(../../libs/utils/utils.pri)
 include(../../plugins/coreplugin/coreplugin.pri)

src/plugins/subversion/subversion.pro

@@ -8,8 +8,6 @@ include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/vcsbase/vcsbase.pri)
 include(../../libs/utils/utils.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += annotationhighlighter.h \
     subversionplugin.h \
     subversioncontrol.h \

src/plugins/tasklist/tasklist.pro

@@ -5,8 +5,6 @@ include(../../qtcreatorplugin.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/projectexplorer/projectexplorer.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += tasklistplugin.h \
     tasklist_export.h \
     tasklistconstants.h \

src/plugins/tasklist/tasklist.qbs

@@ -5,14 +5,12 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "TaskList"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "Find" }
     Depends { name: "Locator" }
     Depends { name: "TextEditor" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "TaskList.mimetypes.xml",
@@ -29,4 +27,3 @@ QtcPlugin {
         "tasklistplugin.h",
     ]
 }
-

src/plugins/texteditor/texteditor.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = TextEditor
-DEFINES += TEXTEDITOR_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += TEXTEDITOR_LIBRARY
 QT += xml network
 CONFIG += exceptions
 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport

src/plugins/texteditor/texteditor.qbs

@@ -6,12 +6,10 @@ QtcPlugin {
     name: "TextEditor"
 
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script", "printsupport"] }
-    Depends { name: "cpp" }
     Depends { name: "Core" }
     Depends { name: "Find" }
     Depends { name: "Locator" }
 
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
     cpp.includePaths: base.concat([
         "generichighlighter",
         "snippets",

src/plugins/todo/todo.pro

@@ -4,8 +4,6 @@ TARGET = Todo
 include(../../qtcreatorplugin.pri)
 include(todo_dependencies.pri)
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += todoplugin.h \
     keyword.h \
     constants.h \

src/plugins/todo/todo.qbs

@@ -13,9 +13,6 @@ QtcPlugin {
     Depends { name: "CppTools" }
     Depends { name: "QmlJs" }
 
-    Depends { name: "cpp" }
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
-
     files: [
         "constants.h",
         "cpptodoitemsscanner.cpp",

src/plugins/updateinfo/updateinfo.pro

@@ -2,8 +2,6 @@ TARGET = UpdateInfo
 TEMPLATE = lib
 QT += network xml
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += updateinfoplugin.h \
     updateinfobutton.h
 SOURCES += updateinfoplugin.cpp \

src/plugins/updateinfo/updateinfo.qbs

@@ -17,7 +17,6 @@ QtcPlugin {
         "..",
         buildDirectory,
     ]
-    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
 
     files: [
         "updateinfobutton.cpp",

src/plugins/valgrind/valgrind.pro

@@ -12,8 +12,6 @@ CONFIG += exceptions
 
 INCLUDEPATH *= $$PWD
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-
 HEADERS += \
     valgrindplugin.h \
     valgrindengine.h \