summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/cplusplus')
-rw-r--r--src/libs/cplusplus/cplusplus-lib.pri2
-rw-r--r--src/libs/cplusplus/cplusplus.qbs3
2 files changed, 1 insertions, 4 deletions
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index f8c9bb56fd..f5d1b0a511 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 712197ed29..08213f11d6 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"