From 88267a3299dd1414b1889028e35917841d47fdcc Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sat, 12 Jan 2013 23:29:24 +0200
Subject: [PATCH] Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
---
qbs/defaults.js | 3 ++-
qtcreator.pri | 3 +--
share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri | 1 +
share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri | 1 +
src/libs/aggregation/aggregation.pro | 2 +-
src/libs/aggregation/aggregation.qbs | 2 +-
src/libs/cplusplus/cplusplus-lib.pri | 2 --
src/libs/cplusplus/cplusplus.qbs | 3 +--
src/libs/extensionsystem/extensionsystem.pro | 2 +-
src/libs/extensionsystem/extensionsystem.qbs | 3 +--
src/libs/glsl/glsl.pro | 3 +--
src/libs/glsl/glsl.qbs | 3 +--
src/libs/languageutils/languageutils.pro | 2 +-
src/libs/languageutils/languageutils.qbs | 3 +--
src/libs/qmldebug/qmldebug.pro | 2 --
src/libs/qmldebug/qmldebug.qbs | 5 +----
src/libs/qmleditorwidgets/qmleditorwidgets.pro | 2 +-
src/libs/qmleditorwidgets/qmleditorwidgets.qbs | 3 +--
src/libs/qmljs/qmljs.pro | 2 +-
src/libs/qmljs/qmljs.qbs | 3 +--
src/libs/utils/utils-lib.pri | 2 --
src/libs/utils/utils.qbs | 2 +-
src/libs/zeroconf/zeroconf.pro | 2 +-
src/libs/zeroconf/zeroconf.qbs | 2 +-
src/plugins/analyzerbase/analyzerbase.pro | 2 +-
src/plugins/analyzerbase/analyzerbase.qbs | 5 +----
src/plugins/android/android.pro | 1 -
.../autotoolsprojectmanager/autotoolsprojectmanager.pro | 1 -
.../autotoolsprojectmanager/autotoolsprojectmanager.qbs | 3 ---
src/plugins/bazaar/bazaar.pro | 1 -
src/plugins/bineditor/bineditor.pro | 2 --
src/plugins/bineditor/bineditor.qbs | 3 ---
src/plugins/bookmarks/bookmarks.pro | 2 --
src/plugins/bookmarks/bookmarks.qbs | 3 ---
src/plugins/clearcase/clearcase.pro | 2 --
src/plugins/clearcase/clearcase.qbs | 3 ---
src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro | 2 --
src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs | 3 ---
src/plugins/coreplugin/coreplugin.pro | 3 +--
src/plugins/coreplugin/coreplugin.qbs | 1 -
src/plugins/cpaster/cpaster.pro | 1 -
src/plugins/cppeditor/cppeditor.pro | 2 +-
src/plugins/cppeditor/cppeditor.qbs | 1 -
src/plugins/cpptools/cpptools.pro | 1 -
src/plugins/cpptools/cpptools.qbs | 3 ---
src/plugins/cvs/cvs.pro | 1 -
src/plugins/debugger/debugger.pro | 2 +-
src/plugins/debugger/debugger.qbs | 1 -
src/plugins/designer/designer.pro | 2 +-
src/plugins/fakevim/fakevim.pro | 1 -
src/plugins/fakevim/fakevim.qbs | 2 --
src/plugins/genericprojectmanager/genericprojectmanager.pro | 2 --
src/plugins/genericprojectmanager/genericprojectmanager.qbs | 2 --
src/plugins/git/git.pro | 1 -
src/plugins/git/git.qbs | 3 ---
src/plugins/glsleditor/glsleditor.pro | 3 +--
src/plugins/glsleditor/glsleditor.qbs | 2 --
src/plugins/help/help.pro | 3 +--
src/plugins/help/help.qbs | 2 +-
src/plugins/imageviewer/imageviewer.pro | 2 --
src/plugins/imageviewer/imageviewer.qbs | 2 --
src/plugins/locator/locator.pro | 2 +-
src/plugins/locator/locator.qbs | 1 -
src/plugins/macros/macros.pro | 2 +-
src/plugins/macros/macros.qbs | 2 --
src/plugins/madde/madde.pro | 2 +-
src/plugins/madde/madde.qbs | 3 ---
src/plugins/mercurial/mercurial.pro | 1 -
src/plugins/perforce/perforce.pro | 2 --
src/plugins/projectexplorer/projectexplorer.pro | 2 +-
src/plugins/projectexplorer/projectexplorer.qbs | 2 +-
src/plugins/qmldesigner/designercore/iwidgetplugin.pri | 1 +
src/plugins/qmldesigner/qmldesignerplugin.pro | 2 ++
src/plugins/qmljseditor/qmljseditor.pro | 3 +--
src/plugins/qmljseditor/qmljseditor.qbs | 2 +-
src/plugins/qmljstools/qmljstools.pro | 1 -
src/plugins/qmljstools/qmljstools.qbs | 1 -
src/plugins/qmlprofiler/qmlprofiler.pro | 2 +-
src/plugins/qmlprofiler/qmlprofiler.qbs | 1 -
src/plugins/qmlprojectmanager/qmlprojectmanager.pro | 2 +-
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs | 2 +-
src/plugins/qnx/qnx.pro | 2 --
src/plugins/qnx/qnx.qbs | 1 -
src/plugins/qt4projectmanager/qt4projectmanager.pro | 3 +--
src/plugins/qt4projectmanager/qt4projectmanager.qbs | 3 +--
src/plugins/qtsupport/qtsupport.pro | 3 ---
src/plugins/qtsupport/qtsupport.qbs | 2 --
src/plugins/remotelinux/remotelinux.pro | 4 +---
src/plugins/remotelinux/remotelinux.qbs | 2 +-
src/plugins/resourceeditor/resourceeditor.pro | 2 --
src/plugins/subversion/subversion.pro | 2 --
src/plugins/tasklist/tasklist.pro | 2 --
src/plugins/tasklist/tasklist.qbs | 3 ---
src/plugins/texteditor/texteditor.pro | 2 +-
src/plugins/texteditor/texteditor.qbs | 2 --
src/plugins/todo/todo.pro | 2 --
src/plugins/todo/todo.qbs | 3 ---
src/plugins/updateinfo/updateinfo.pro | 2 --
src/plugins/updateinfo/updateinfo.qbs | 1 -
src/plugins/valgrind/valgrind.pro | 2 --
src/plugins/valgrind/valgrind.qbs | 2 --
src/plugins/vcsbase/vcsbase.pro | 2 +-
102 files changed, 50 insertions(+), 167 deletions(-)
diff --git a/qbs/defaults.js b/qbs/defaults.js
index 2233af0995d..b486888e902 100644
--- a/qbs/defaults.js
+++ b/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")
diff --git a/qtcreator.pri b/qtcreator.pri
index c4882530fa4..cc16ef9079e 100644
--- a/qtcreator.pri
+++ b/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
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
!macx:DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
unix {
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
index f8ce91f5292..1c561d55e06 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
+++ b/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 {
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
index 1ae80970903..1155dbf423c 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
+++ b/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 {
diff --git a/src/libs/aggregation/aggregation.pro b/src/libs/aggregation/aggregation.pro
index 2ed325667aa..b601bbc0610 100644
--- a/src/libs/aggregation/aggregation.pro
+++ b/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
diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs
index 63896d40e74..b3ab3397987 100644
--- a/src/libs/aggregation/aggregation.qbs
+++ b/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",
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index f8c9bb56fd7..f5d1b0a5112 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/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 \
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 712197ed291..08213f11d60 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -7,8 +7,7 @@ QtcLibrary {
cpp.includePaths: base.concat("../3rdparty/cplusplus")
cpp.defines: base.concat([
"NDEBUG",
- "CPLUSPLUS_BUILD_LIB",
- "QT_NO_CAST_FROM_ASCII"
+ "CPLUSPLUS_BUILD_LIB"
])
cpp.optimization: "fast"
diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro
index 466bb0ad30c..13e1f398094 100644
--- a/src/libs/extensionsystem/extensionsystem.pro
+++ b/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)
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 015e216b404..f7a90814cb2 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -6,8 +6,7 @@ QtcLibrary {
cpp.defines: base.concat([
"EXTENSIONSYSTEM_LIBRARY",
- "IDE_TEST_DIR=\".\"",
- "QT_NO_CAST_FROM_ASCII"
+ "IDE_TEST_DIR=\".\""
])
Depends { name: "cpp" }
diff --git a/src/libs/glsl/glsl.pro b/src/libs/glsl/glsl.pro
index 9b418129a5c..2268ab55f7b 100644
--- a/src/libs/glsl/glsl.pro
+++ b/src/libs/glsl/glsl.pro
@@ -2,8 +2,7 @@ TEMPLATE = lib
TARGET = GLSL
DEFINES += \
GLSL_BUILD_LIB \
- QT_CREATOR \
- QT_NO_CAST_FROM_ASCII
+ QT_CREATOR
include(../../qtcreatorlibrary.pri)
include(glsl-lib.pri)
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index 9b643420ef0..fc5c0ab7f54 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -6,8 +6,7 @@ QtcLibrary {
cpp.defines: base.concat([
"QT_CREATOR",
- "GLSL_BUILD_LIB",
- "QT_NO_CAST_FROM_ASCII"
+ "GLSL_BUILD_LIB"
])
Depends { name: "cpp" }
diff --git a/src/libs/languageutils/languageutils.pro b/src/libs/languageutils/languageutils.pro
index 0adb6013dc9..ecf48889224 100644
--- a/src/libs/languageutils/languageutils.pro
+++ b/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
diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs
index 3908afc79cb..811c4a96090 100644
--- a/src/libs/languageutils/languageutils.qbs
+++ b/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",
- "QT_NO_CAST_FROM_ASCII"
+ "LANGUAGEUTILS_BUILD_DIR"
])
cpp.optimization: "fast"
diff --git a/src/libs/qmldebug/qmldebug.pro b/src/libs/qmldebug/qmldebug.pro
index a049f87175c..26a1a408566 100644
--- a/src/libs/qmldebug/qmldebug.pro
+++ b/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
diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs
index fad77af655f..beba3569377 100644
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -4,10 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "QmlDebug"
- cpp.defines: base.concat([
- "QMLDEBUG_LIB",
- "QT_NO_CAST_FROM_ASCII"
- ])
+ cpp.defines: base.concat("QMLDEBUG_LIB")
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["gui", "network"] }
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pro b/src/libs/qmleditorwidgets/qmleditorwidgets.pro
index 1e150ba8d2b..99eced93756 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.pro
+++ b/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
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index 7277dce9fd7..19099b41569 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -8,8 +8,7 @@ QtcLibrary {
cpp.defines: base.concat([
"QWEAKPOINTER_ENABLE_ARROW",
"BUILD_QMLEDITORWIDGETS_LIB",
- "QT_CREATOR",
- "QT_NO_CAST_FROM_ASCII"
+ "QT_CREATOR"
])
cpp.optimization: "fast"
diff --git a/src/libs/qmljs/qmljs.pro b/src/libs/qmljs/qmljs.pro
index 4fc2c261e95..7c93645b8c5 100644
--- 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)
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index 72dfa88c6ef..f68218fbceb 100644
--- 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"
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index 3bc345026b7..53f8ae8a39e 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/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
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 6380a54fd22..08baf0fbc9d 100644
--- a/src/libs/utils/utils.qbs
+++ b/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"
diff --git a/src/libs/zeroconf/zeroconf.pro b/src/libs/zeroconf/zeroconf.pro
index e07dd11a5a7..0d5c07b31cc 100644
--- a/src/libs/zeroconf/zeroconf.pro
+++ b/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 \
diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
index 5ca90c5df66..04274fd6f69 100644
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/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"
diff --git a/src/plugins/analyzerbase/analyzerbase.pro b/src/plugins/analyzerbase/analyzerbase.pro
index b3512f66cdf..6659c64d23e 100644
--- a/src/plugins/analyzerbase/analyzerbase.pro
+++ b/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)
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 36a11871ed4..621bdd10d7d 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -13,10 +13,7 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "cpp" }
- cpp.defines: base.concat([
- "ANALYZER_LIBRARY",
- "QT_NO_CAST_FROM_ASCII"
- ])
+ cpp.defines: base.concat("ANALYZER_LIBRARY")
files: [
"analyzerbase.qrc",
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index 94e3fd054c5..4361a95ab02 100644
--- a/src/plugins/android/android.pro
+++ b/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
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
index 92cc4bc09c0..7503546796d 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
+++ b/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)
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
index d5b9e0ebac1..4bfba21bbfa 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
+++ b/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",
diff --git a/src/plugins/bazaar/bazaar.pro b/src/plugins/bazaar/bazaar.pro
index 5fc6bc8b7dd..895f50473de 100644
--- a/src/plugins/bazaar/bazaar.pro
+++ b/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 \
diff --git a/src/plugins/bineditor/bineditor.pro b/src/plugins/bineditor/bineditor.pro
index 42c76266b4d..86332941741 100644
--- a/src/plugins/bineditor/bineditor.pro
+++ b/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 \
diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs
index 575e89b1049..f9384838e3a 100644
--- a/src/plugins/bineditor/bineditor.qbs
+++ b/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",
diff --git a/src/plugins/bookmarks/bookmarks.pro b/src/plugins/bookmarks/bookmarks.pro
index 0c87874cd20..ec84fb75118 100644
--- a/src/plugins/bookmarks/bookmarks.pro
+++ b/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 \
diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs
index b4d4926fe7c..4601f5a50d8 100644
--- a/src/plugins/bookmarks/bookmarks.qbs
+++ b/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",
diff --git a/src/plugins/clearcase/clearcase.pro b/src/plugins/clearcase/clearcase.pro
index c40f5475dfc..d0ead945bfc 100644
--- a/src/plugins/clearcase/clearcase.pro
+++ b/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 \
diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs
index 18a15de51a6..2264d7d47ca 100644
--- a/src/plugins/clearcase/clearcase.qbs
+++ b/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",
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
index 95c490f2304..e52e9a730c3 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
+++ b/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 \
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 6637e47dedb..9fdfdf9df1b 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/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",
]
}
-
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index c939dc1ae35..bb02bfc6318 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -1,7 +1,6 @@
TEMPLATE = lib
TARGET = Core
-DEFINES += CORE_LIBRARY \
- QT_NO_CAST_FROM_ASCII
+DEFINES += CORE_LIBRARY
QT += network \
script \
sql
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 758eb0a439f..b8250e8cfb1 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -32,7 +32,6 @@ QtcPlugin {
]
}
- cpp.defines: base.concat([ "QT_NO_CAST_FROM_ASCII" ])
files: [
"basefilewizard.cpp",
"basefilewizard.h",
diff --git a/src/plugins/cpaster/cpaster.pro b/src/plugins/cpaster/cpaster.pro
index a06c2c74d58..5cb3e3a7134 100644
--- a/src/plugins/cpaster/cpaster.pro
+++ b/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 \
diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index df70df51a9f..5fc351a3b68 100644
--- a/src/plugins/cppeditor/cppeditor.pro
+++ b/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 \
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 7b28ec16919..8cd892a574f 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/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",
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 7198cf28a8c..4151ba9b0b9 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/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 \
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 4a9dcc729b7..687182bec9c 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/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",
diff --git a/src/plugins/cvs/cvs.pro b/src/plugins/cvs/cvs.pro
index 77fdac98108..0f042def665 100644
--- a/src/plugins/cvs/cvs.pro
+++ b/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 \
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 23f3211e071..e24bb8116ee 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/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
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 5b1eb8ba358..aca3f4b358e 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/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)
diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index e1175df8a29..6b4a90221b1 100644
--- a/src/plugins/designer/designer.pro
+++ b/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)
diff --git a/src/plugins/fakevim/fakevim.pro b/src/plugins/fakevim/fakevim.pro
index c69cef4f365..cf98503f335 100644
--- a/src/plugins/fakevim/fakevim.pro
+++ b/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 \
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index 8652b59b285..218897eb2e6 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/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",
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro
index e40e1e7fcc7..0a684bc7aa9 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.pro
+++ b/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 \
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index c574e523e41..8a47a547cbc 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/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",
diff --git a/src/plugins/git/git.pro b/src/plugins/git/git.pro
index 7ddef370978..d562d567bd2 100644
--- a/src/plugins/git/git.pro
+++ b/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)
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 92c2597219c..91c2fa0700e 100644
--- a/src/plugins/git/git.qbs
+++ b/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",
diff --git a/src/plugins/glsleditor/glsleditor.pro b/src/plugins/glsleditor/glsleditor.pro
index 5385b7f0941..7a5385842a9 100644
--- a/src/plugins/glsleditor/glsleditor.pro
+++ b/src/plugins/glsleditor/glsleditor.pro
@@ -5,8 +5,7 @@ include(glsleditor_dependencies.pri)
DEFINES += \
GLSLEDITOR_LIBRARY \
- QT_CREATOR \
- QT_NO_CAST_FROM_ASCII
+ QT_CREATOR
HEADERS += \
glsleditor.h \
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 36afc36beb3..66272773149 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/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",
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index 3d2e2c76586..7e2dd639dc7 100644
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -18,8 +18,7 @@ include(help_dependencies.pri)
DEFINES += \
QT_CLUCENE_SUPPORT \
- HELP_LIBRARY \
- QT_NO_CAST_FROM_ASCII
+ HELP_LIBRARY
HEADERS += \
centralwidget.h \
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 384a7b764f2..75152239c4a 100644
--- a/src/plugins/help/help.qbs
+++ b/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: [
diff --git a/src/plugins/imageviewer/imageviewer.pro b/src/plugins/imageviewer/imageviewer.pro
index 6a0fbf40a1e..b674eb4ffe0 100644
--- a/src/plugins/imageviewer/imageviewer.pro
+++ b/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 \
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 22edd46499f..79e5528baa4 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/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",
diff --git a/src/plugins/locator/locator.pro b/src/plugins/locator/locator.pro
index 7227847c473..fab92816fc9 100644
--- a/src/plugins/locator/locator.pro
+++ b/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 \
diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs
index 33380005a66..af809cfd841 100644
--- a/src/plugins/locator/locator.qbs
+++ b/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",
diff --git a/src/plugins/macros/macros.pro b/src/plugins/macros/macros.pro
index 9401495f04b..15db6eece70 100644
--- a/src/plugins/macros/macros.pro
+++ b/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)
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index 1964853e7e2..c30877a7cca 100644
--- a/src/plugins/macros/macros.qbs
+++ b/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",
diff --git a/src/plugins/madde/madde.pro b/src/plugins/madde/madde.pro
index 15d749f9d77..ba7f2bc223e 100644
--- a/src/plugins/madde/madde.pro
+++ b/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
diff --git a/src/plugins/madde/madde.qbs b/src/plugins/madde/madde.qbs
index 5a14e1fbd37..a6641b6a6ee 100644
--- a/src/plugins/madde/madde.qbs
+++ b/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",
diff --git a/src/plugins/mercurial/mercurial.pro b/src/plugins/mercurial/mercurial.pro
index c63171089e4..20a1f94ceb9 100644
--- a/src/plugins/mercurial/mercurial.pro
+++ b/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 \
diff --git a/src/plugins/perforce/perforce.pro b/src/plugins/perforce/perforce.pro
index 403f07257d0..7754b7fae50 100644
--- a/src/plugins/perforce/perforce.pro
+++ b/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 \
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 426c56906c1..f9c74e5019c 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/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
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index bd253f63bb7..87515c538c3 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/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"
diff --git a/src/plugins/qmldesigner/designercore/iwidgetplugin.pri b/src/plugins/qmldesigner/designercore/iwidgetplugin.pri
index 8dceea3244c..14cba526876 100644
--- a/src/plugins/qmldesigner/designercore/iwidgetplugin.pri
+++ b/src/plugins/qmldesigner/designercore/iwidgetplugin.pri
@@ -1 +1,2 @@
INCLUDEPATH += $$PWD/include
+DEFINES -= QT_NO_CAST_FROM_ASCII
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index 6935895dcc4..a2066c59b77 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/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
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro
index c5337325218..2227e1e5601 100644
--- 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 \
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 5954d2117ff..11d06ce5d73 100644
--- 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",
diff --git a/src/plugins/qmljstools/qmljstools.pro b/src/plugins/qmljstools/qmljstools.pro
index adb49b237d0..b956081b772 100644
--- a/src/plugins/qmljstools/qmljstools.pro
+++ b/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 {
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 5a318f8970b..9f62253750f 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/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: [
diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro
index 96c339da005..ca75dc68c00 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.pro
+++ b/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
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index c5be6186717..7a97fec0b72 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/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",
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
index dc4a5439f52..c8eabe10c01 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
+++ b/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 \
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 7db013c9f46..3900c9d1084 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/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",
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro
index 5bc1501bab2..7fd2b085d31 100644
--- a/src/plugins/qnx/qnx.pro
+++ b/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
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index b5b093b903a..17ab8eddc11 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/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: [
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index a93c4ee8060..0f648d3852b 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -6,8 +6,7 @@ include(qt4projectmanager_dependencies.pri)
DEFINES += \
QT_CREATOR \
- QT4PROJECTMANAGER_LIBRARY \
- QT_NO_CAST_FROM_ASCII
+ QT4PROJECTMANAGER_LIBRARY
HEADERS += \
qmakekitinformation.h \
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 08e880bdb3f..57502c1d0e7 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -20,8 +20,7 @@ QtcPlugin {
"PROPARSER_AS_LIBRARY",
"PROPARSER_THREAD_SAFE",
"PROEVALUATOR_THREAD_SAFE",
- "PROEVALUATOR_CUMULATIVE",
- "QT_NO_CAST_FROM_ASCII"
+ "PROEVALUATOR_CUMULATIVE"
])
cpp.includePaths: base.concat([
"customwidgetwizard",
diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro
index 701aa5dd0ed..8a5799316b0 100644
--- a/src/plugins/qtsupport/qtsupport.pro
+++ b/src/plugins/qtsupport/qtsupport.pro
@@ -61,6 +61,3 @@ FORMS += \
qtversioninfo.ui \
debugginghelper.ui \
qtversionmanager.ui \
-
-
-DEFINES += QT_NO_CAST_FROM_ASCII
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index d5130584521..cc30200f0f4 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/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",
diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro
index e26ccd9f032..61a57481c6c 100644
--- a/src/plugins/remotelinux/remotelinux.pro
+++ b/src/plugins/remotelinux/remotelinux.pro
@@ -100,6 +100,4 @@ FORMS += \
RESOURCES += remotelinux.qrc
-DEFINES += \
- REMOTELINUX_LIBRARY \
- QT_NO_CAST_FROM_ASCII
+DEFINES += REMOTELINUX_LIBRARY
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index f98e7ba9506..79beba45593 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/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",
diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro
index bfdb9a528a9..5db47efcf83 100644
--- a/src/plugins/resourceeditor/resourceeditor.pro
+++ b/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)
diff --git a/src/plugins/subversion/subversion.pro b/src/plugins/subversion/subversion.pro
index dbb1765c396..b7be53fe6d9 100644
--- a/src/plugins/subversion/subversion.pro
+++ b/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 \
diff --git a/src/plugins/tasklist/tasklist.pro b/src/plugins/tasklist/tasklist.pro
index be8cebc23a7..9c35d6aea9c 100644
--- a/src/plugins/tasklist/tasklist.pro
+++ b/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 \
diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs
index d428621359c..4b3b8a7b455 100644
--- a/src/plugins/tasklist/tasklist.qbs
+++ b/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",
]
}
-
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index d741a0e2bb4..e4e9be0c667 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/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
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index b996e99737f..897deaf8d37 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/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",
diff --git a/src/plugins/todo/todo.pro b/src/plugins/todo/todo.pro
index b9a659a42c0..97e6f95b648 100644
--- a/src/plugins/todo/todo.pro
+++ b/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 \
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index 85d218de15b..78b9710d0b3 100644
--- a/src/plugins/todo/todo.qbs
+++ b/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",
diff --git a/src/plugins/updateinfo/updateinfo.pro b/src/plugins/updateinfo/updateinfo.pro
index ce9f2d29230..fb3a2b31182 100644
--- a/src/plugins/updateinfo/updateinfo.pro
+++ b/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 \
diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs
index c52d5404c6e..a7d0a12407b 100644
--- a/src/plugins/updateinfo/updateinfo.qbs
+++ b/src/plugins/updateinfo/updateinfo.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
"..",
buildDirectory,
]
- cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
files: [
"updateinfobutton.cpp",
diff --git a/src/plugins/valgrind/valgrind.pro b/src/plugins/valgrind/valgrind.pro
index 2e8566a178e..95d5ec7f85a 100644
--- a/src/plugins/valgrind/valgrind.pro
+++ b/src/plugins/valgrind/valgrind.pro
@@ -12,8 +12,6 @@ CONFIG += exceptions
INCLUDEPATH *= $$PWD
-DEFINES += QT_NO_CAST_FROM_ASCII
-
HEADERS += \
valgrindplugin.h \
valgrindengine.h \
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index d8f91c58f55..e3add86457b 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Valgrind"
- Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "Core" }
Depends { name: "AnalyzerBase" }
@@ -13,7 +12,6 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "RemoteLinux" }
Depends { name: "CPlusPlus"}
- cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
files: [
"callgrindcostdelegate.cpp",
diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro
index ea89fb5999a..2b2d68a33b3 100644
--- a/src/plugins/vcsbase/vcsbase.pro
+++ b/src/plugins/vcsbase/vcsbase.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
TARGET = VcsBase
-DEFINES += VCSBASE_LIBRARY QT_NO_CAST_FROM_ASCII
+DEFINES += VCSBASE_LIBRARY
include(../../qtcreatorplugin.pri)
include(vcsbase_dependencies.pri)
HEADERS += vcsbase_global.h \
--
GitLab