AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable deprecated feature for now

Browse Source 
Rationale is that it makes it possible to deprecate functions without
breaking other modules.

After the feature freeze, this should be reset to 5

Notice that QT_DEPRECATED is not defined while bootstrapping Qt
(QT_NO_DEPRECATED defined)

This also means that compilation is tested

Change-Id: I85f0e65ac3a160e9aba3833787ded3f94304cb90
Reviewed-by: David Faure <faure@kde.org>
This commit is contained in:
Olivier Goffart 2011-10-26 20:25:35 +02:00 committed by Qt by Nokia
parent 255f569a43
commit 1fe8fb81b1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/global/qglobal.h
View File

@ -55,7 +55,8 @@
#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
#ifndef QT_DISABLE_DEPRECATED_BEFORE
#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(5, 0, 0)
// ### Qt5: remember to change that to 5 when we reach feature freeze
#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 9, 0)
#endif
/*
@ -69,7 +70,7 @@
QT_DEPRECATED void deprecatedFunction(); //function deprecated since Qt 5.1
#endif
*/
#define QT_DEPRECATED_SINCE(major, minor) (QT_VERSION_CHECK(major, minor, 0) > QT_DISABLE_DEPRECATED_BEFORE)
#define QT_DEPRECATED_SINCE(major, minor) (defined(QT_DEPRECATED) && QT_VERSION_CHECK(major, minor, 0) > QT_DISABLE_DEPRECATED_BEFORE)
#define QT_PACKAGEDATE_STR "YYYY-MM-DD"