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>

diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 8b4d769..d569cdb 100644 (file)
--- 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

diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index 32994f3..d282682 100644 (file)
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -1,9 +1,5 @@
 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
 CONFIG += qt plugin
 
 if(win32|mac):!wince*:!macx-xcode {