Changeset 8 for trunk/qmake/option.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/qmake/option.cpp (modified) (6 diffs)

trunk/qmake/option.cpp

@@ -73 +73 @@
 #if defined(Q_OS_WIN32)
 Option::TARG_MODE Option::target_mode = Option::TARG_WIN_MODE;
+#elif defined(Q_OS_OS2)
+Option::TARG_MODE Option::target_mode = Option::TARG_OS2_MODE;
 #elif defined(Q_OS_MAC9)
 Option::TARG_MODE Option::target_mode = Option::TARG_MAC9_MODE;
@@ -148 +150 @@
             "\t-unix          Run in unix mode\n"
             "\t-win32         Run in win32 mode\n"
+            "\t-os2           Run in OS/2 mode\n"
             "\t-macx          Run in Mac OS X mode\n"
             "\t-d             Increase debug level\n"
@@ -220 +223 @@
             } else if(opt == "win32") {
                 Option::target_mode = TARG_WIN_MODE;
+            } else if(opt == "os2") {
+                Option::target_mode = TARG_OS2_MODE;
             } else if(opt == "d") {
                 Option::debug_level++;
@@ -393 +398 @@
 
     //defaults for globals
-    if(Option::target_mode == Option::TARG_WIN_MODE) {
-        Option::dir_sep = "\\";
+    if(Option::target_mode == Option::TARG_WIN_MODE ||
+        Option::target_mode == Option::TARG_OS2_MODE)
+    {
+        Option::dir_sep = "\\";
         Option::obj_ext =  ".obj";
     } else {
@@ -485 +492 @@
     if(Option::target_mode == TARG_MAC9_MODE) 
         tmp = tmp.replace('/', Option::dir_sep).replace('\\', Option::dir_sep);
-    else if(Option::target_mode == TARG_WIN_MODE) 
+    else if(Option::target_mode == TARG_WIN_MODE || Option::target_mode == TARG_OS2_MODE) 
         tmp = tmp.replace('/', Option::dir_sep);
     else 
@@ -500 +507 @@
     if(canonical)
         tmp = fixPath(tmp);
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
     return tmp.replace('/', '\\');
 #else