diff options
| -rw-r--r-- | mkspecs/features/qt_module.prf | 9 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 4930c36aec..4663e17c4c 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -226,6 +226,15 @@ DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our ge DEFINES *= QT_USE_QSTRINGBUILDER DEFINES *= QT_DEPRECATED_WARNINGS +win32 { + # On Windows, due to the way DLLs work, we need to export all functions, + # including the inlines + DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x040900 +} else { + # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API + DEFINES *= QT_DISABLE_DEPRECATED_BEFORE=0x050000 +} + TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end # Provides useful info normally only contained in the internal .qmake.cache file 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 /* |