Changeset 29 for trunk/qmake/project.cpp

Timestamp:

Jun 12, 2009, 1:32:11 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: More OS/2-specific fixes. Enabled GNUMakefileGenerator (turned on by MAKEFILE_GENERATOR=GNUMAKE).

File:

• trunk/qmake/project.cpp (modified) (2 diffs)

trunk/qmake/project.cpp

@@ -59 +59 @@
 #elif defined(Q_OS_WIN32)
 #include <Windows.h>
+#elif defined(Q_OS_OS2)
+#include <qt_os2.h>
 #endif
 #include <stdio.h>
@@ -3176 +3178 @@
             }
         }
+#elif defined(Q_OS_OS2)
+        if(type == "os") {
+            ret = "OS2";
+        } else if(type == "name") {
+            ret = QString::fromLocal8Bit(qgetenv("HOSTNAME"));
+        } else if(type == "version" || type == "version_string") {
+            ULONG buf [3];
+            DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_REVISION,
+                            &buf, sizeof(buf));
+            if(type == "version")
+                ret = QString().sprintf("%u.%u.%u", buf[0], buf[1], buf[2]);
+            else {
+                /* Warp 3 is reported as 20.30 */
+                /* Warp 4 is reported as 20.40 */
+                /* Aurora and eCS are reported as 20.45 */
+                if (buf[0] == 20 && buf[1] == 30)
+                    ret = "Warp3";
+                else if (buf[0] == 20 && buf[1] == 40)
+                    ret = "Warp4";
+                else if (buf[0] == 20 && buf[1] == 45) {
+                    if (QString::fromLocal8Bit(qgetenv("OS")) == "ecs")
+                        ret = "eComStation";
+                    else
+                        ret = "Aurora";
+                }
+                else
+                    ret = "Unknown";
+            }
+        } else if(type == "arch") {
+            ret = "x86";
+        }
 #elif defined(Q_OS_UNIX)
         struct utsname name;