From 0b6c2422b879365cf0cf729f60fb8f2fc5c2c803 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 12 Aug 2016 16:36:12 +0300 Subject: [PATCH] Project: Disable deprecated functions Change-Id: Ifd26ab4237664c0887b521e867cf801a65d49fcd Reviewed-by: Christian Kandeler Reviewed-by: Eike Ziller --- qbs/modules/qtc/qtc.qbs | 3 ++- qtcreator.pri | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index b86dbb3edbe..69d2f6c8762 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -63,7 +63,8 @@ Module { "QT_CREATOR", 'IDE_LIBRARY_BASENAME="' + libDirName + '"', "QT_NO_CAST_TO_ASCII", - "QT_RESTRICTED_CAST_FROM_ASCII" + "QT_RESTRICTED_CAST_FROM_ASCII", + "QT_DISABLE_DEPRECATED_BEFORE=0x050600", ].concat(testsEnabled ? ["WITH_TESTS"] : []) Rule { diff --git a/qtcreator.pri b/qtcreator.pri index 8997b4a9961..1fcae0baf25 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -179,7 +179,11 @@ exists($$IDE_LIBRARY_PATH): LIBS *= -L$$IDE_LIBRARY_PATH # library path from ou DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" } -DEFINES += QT_CREATOR QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII +DEFINES += \ + QT_CREATOR \ + QT_NO_CAST_TO_ASCII \ + QT_RESTRICTED_CAST_FROM_ASCII \ + QT_DISABLE_DEPRECATED_BEFORE=0x050600 !macx:DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION unix {