diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-04-30 16:03:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-08 14:57:59 +0200 |
| commit | bc420e87e634d6f114e240430bf3228dc3beee21 (patch) | |
| tree | e41971d31601827219f65c70d253e28e0f3c838f /src/corelib/global/qglobal.h | |
| parent | 7ed5f3b867db5eb5b0bd6dc49828e0e6931b60f9 (diff) | |
Make the default Qt API be Qt 5.0's
This means user applications will default to Qt 5.0's API. Higher
versions or Qt 4 compatibility are opt-in.
Also set the default for Qt's own build to be 5.0 on all platforms
except Windows. On Windows, we need to set it to 4.9.
Task-number: QTBUG-25053
Change-Id: I603e0fda4785e64e1413cd82153a89e48005aa40
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8aea18dcb2..d3e2898a99 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -332,8 +332,7 @@ QT_END_INCLUDE_NAMESPACE #endif #ifndef QT_DISABLE_DEPRECATED_BEFORE -// ### Qt5: remember to change that to 5 when we reach feature freeze -#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 9, 0) +#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(5, 0, 0) #endif /* |