Changeset 1051

Timestamp:

Sep 5, 2011, 5:11:20 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Add QMAKE_TARGET_VERSION to qt_targets.pri.

This will cause all DLL and EXE targets that include qt_targets.pri to get the
correct verison number embedded w/o playing with the dangerous
VERSION variable (see r1050).

Location:

trunk

Files:

• mkspecs/features/os2/default_post.prf (modified) (1 diff)
• src/qt_targets.pri (modified) (1 diff)

trunk/mkspecs/features/os2/default_post.prf

@@ -25 +25 @@
     # convert QMAKE_TARGET_ variables to DEF_FILE_ ones
     isEmpty(DEF_FILE_VERSION) {
-        !isEmpty(VERSION):DEF_FILE_VERSION = $$VERSION
-        else:DEF_FILE_VERSION = $$QMAKE_TARGET_VERSION
+        !isEmpty(VERSION
+        else:DEF_FILE_VERSION = $$VERSION
     }
     isEmpty(DEF_FILE_DESCRIPTION) {

trunk/src/qt_targets.pri

@@ -5 +5 @@
 
 os2 {
-    # too long company name does not fit
+    # too long company name does not fit
     QMAKE_TARGET_COMPANY = Nokia
-    !isEmpty(QT_BUILD_VERSION) {
-        # extend the version number embedded in EXEs/DLLs with the build number
-        DEF_FILE_VERSION = $$VERSION.$${QT_BUILD_VERSION}
+    !isEmpty(QT_MAJOR_VERSION) {
+        QMAKE_TARGET_VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+        !isEmpty(QT_BUILD_VERSION) {
+            # extend the version number embedded in EXEs/DLLs with the build number
+            QMAKE_TARGET_VERSION = $${QMAKE_TARGET_VERSION}.$${QT_BUILD_VERSION}
+        }
     }
 }