diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-30 14:09:34 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:40:02 +0200 |
| commit | c23767bab99fb0439d0f3d8822cfbbb7f52498e9 (patch) | |
| tree | dbc038269584c4090962cf1be26e642c797c7152 /mkspecs/features/qt_module_config.prf | |
| parent | a07d4f8fb3c61daf376e85a3e68fe6c6523417d3 (diff) | |
make version fallback code sane
the qt version is always set.
otoh, we need to allow the module to override the own version.
Change-Id: Ic3eb7dae59a5fb011cede09151553b652a0a1d78
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/features/qt_module_config.prf')
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 8b4d769450..d569cdbd95 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -17,11 +17,7 @@ INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES/$$TARGET INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat TEMPLATE = lib -isEmpty(QT_MAJOR_VERSION) { - VERSION=5.0.0 -} else { - VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} -} +isEmpty(VERSION):VERSION = $$QT_VERSION #load up the headers info CONFIG += qt_install_headers |