Changeset 506 for trunk

Timestamp:

Feb 3, 2010, 3:22:04 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

general: Adjust the Qt version string to the format used by emxexpw.cmd to embed a complete version information to the executables and DLLs (uses the new feature brought by r505).

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

@@ -35 +35 @@
         DEF_FILE_DESCR =
         !isEmpty(DEF_FILE_VERSION)|!isEmpty(DEF_FILE_DESCRIPTION)|!isEmpty(DEF_FILE_VENDOR) {
-            DEF_FILE_DESCR = "@$${LITERAL_HASH}vendor:version$${LITERAL_HASH}@ description"
-            DEF_FILE_DESCR = $$replace(DEF_FILE_DESCR, vendor, $$DEF_FILE_VENDOR)
-            DEF_FILE_DESCR = $$replace(DEF_FILE_DESCR, version, $$DEF_FILE_VERSION)
-            DEF_FILE_DESCR = $$replace(DEF_FILE_DESCR, description, $$DEF_FILE_DESCRIPTION)
+            exists($$dirname(QMAKESPEC)/os2-g++/emxexpw.cmd) {
+                DEF_FILE_DESCR = -printbldlevel
+                !isEmpty(DEF_FILE_VERSION):DEF_FILE_DESCR += -version \"$$DEF_FILE_VERSION\"
+                !isEmpty(DEF_FILE_DESCRIPTION):DEF_FILE_DESCR += -desc \"$$DEF_FILE_DESCRIPTION\"
+                !isEmpty(DEF_FILE_VENDOR):DEF_FILE_DESCR += -vendor \"$$DEF_FILE_VENDOR\"
+                DEF_FILE_DESCR = "$$system($$dirname(QMAKESPEC)/os2-g++/emxexpw.cmd $$DEF_FILE_DESCR)"
+            } else {
+                warning($$dirname(QMAKESPEC)/os2-g++/emxexpw.cmd is not found!)
+                warning(BLDLEVEL string in .DEF will not contain all info!)
+                DEF_FILE_DESCR = "@$${LITERAL_HASH}vendor:version$${LITERAL_HASH}@ description"
+                DEF_FILE_DESCR = $$replace(DEF_FILE_DESCR, vendor, $$DEF_FILE_VENDOR)
+                DEF_FILE_DESCR = $$replace(DEF_FILE_DESCR, version, $$DEF_FILE_VERSION)
+                DEF_FILE_DESCR = $$replace(DEF_FILE_DESCR, description, $$DEF_FILE_DESCRIPTION)
+            }
         }
         !isEmpty(DEF_FILE_DESCR)|wlink {

trunk/src/qt_targets.pri

@@ -19 +19 @@
         # extend the version number included in DLLs and EXEs with the SVN revision number
         DEF_FILE_VERSION = $$VERSION
-    !isEmpty(QT_BUILD_VERSION):DEF_FILE_VERSION = $${DEF_FILE_VERSION}-$${QT_BUILD_VERSION}
-    !isEmpty(QMAKESPEC):DEF_FILE_VERSION = $${DEF_FILE_VERSION}_$$basename(QMAKESPEC)
+    !isEmpty(QT_BUILD_VERSION):DEF_FILE_VERSION = $${DEF_FILE_VERSION}$${QT_BUILD_VERSION}
+    !isEmpty(QMAKESPEC):DEF_FILE_VERSION = $${DEF_FILE_VERSION}$$basename(QMAKESPEC)
 }