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 /mkspecs | |
| 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 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 9 |
1 files changed, 9 insertions, 0 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 |