Commit 88267a32 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk
Browse files

Generalize QT_NO_CAST_FROM_ASCII



Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent a31dd26e
......@@ -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")
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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
......
......@@ -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",
......
......@@ -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 \
......
......@@ -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"
......
TEMPLATE = lib
TARGET = ExtensionSystem
DEFINES += EXTENSIONSYSTEM_LIBRARY QT_NO_CAST_FROM_ASCII
DEFINES += EXTENSIONSYSTEM_LIBRARY
include(../../qtcreatorlibrary.pri)
include(extensionsystem_dependencies.pri)
......
......@@ -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" }
......
......@@ -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)
......
......@@ -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" }
......
TEMPLATE = lib
TARGET = LanguageUtils
DEFINES += QT_CREATOR QT_NO_CAST_FROM_ASCII
DEFINES += QT_CREATOR
unix:QMAKE_CXXFLAGS_DEBUG += -O3
......
......@@ -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"
......
......@@ -5,8 +5,6 @@ QT += network
include(../../qtcreatorlibrary.pri)
include(qmldebug-lib.pri)
DEFINES += QT_NO_CAST_FROM_ASCII
OTHER_FILES += \
qmldebug.pri
......@@ -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"] }
......
TEMPLATE = lib
TARGET = QmlEditorWidgets
DEFINES += QWEAKPOINTER_ENABLE_ARROW QT_NO_CAST_FROM_ASCII
DEFINES += QWEAKPOINTER_ENABLE_ARROW
unix:QMAKE_CXXFLAGS_DEBUG += -O3
......
......@@ -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"
......
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)
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment