Changeset 550 for trunk/mkspecs/features/os2/default_post.prf

Timestamp:

Feb 8, 2010, 6:54:00 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/os2: Don't rely on QMAKESPEC as it is not defined outside the Qt4 source tree (e.g. in case of the "dev" WPI package); use [QT_INSTALL_DATA]/mkspecs instead (which is always defined).

File:

• trunk/mkspecs/features/os2/default_post.prf (modified) (1 diff)

trunk/mkspecs/features/os2/default_post.prf

@@ -33 +33 @@
         DEF_FILE_DESCR =
         !isEmpty(DEF_FILE_VERSION)|!isEmpty(DEF_FILE_DESCRIPTION)|!isEmpty(DEF_FILE_VENDOR) {
-            exists($$dirname(QMAKESPEC)/os2-g++/emxexpw.cmd) {
+            QMAKESPEC_DIR = $$dirname(QMAKESPEC)
+            isEmpty(QMAKESPEC_DIR):QMAKESPEC_DIR = $$[QT_INSTALL_DATA]/mkspecs
+            exists($$QMAKESPEC_DIR/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)"
+                DEF_FILE_DESCR = "$$system($$/os2-g++/emxexpw.cmd $$DEF_FILE_DESCR)"
             } else {
-                warning($$dirname(QMAKESPEC)/os2-g++/emxexpw.cmd is not found!)
+                warning($$/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"