Port of Qt to QNX

This makes Qt work on QNX 6.4.
 * no q3support, no phonon
 * no QSharedMemory, no QSystemSemaphore, no QProcess

Reviewed-By: Robert Griebl

5 files changed, 12 insertions, 22 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 665821398..36b6c004c 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2112,8 +2112,6 @@ QString MakefileGenerator::buildArgs(const QString &outdir)
         ret += " -unix";
     else if(Option::target_mode == Option::TARG_WIN_MODE)
         ret += " -win32";
-    else if(Option::target_mode == Option::TARG_QNX6_MODE)
-        ret += " -qnx6";
 
     //configs
     for(QStringList::Iterator it = Option::user_configs.begin();
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 1dafd98dc..68d9d8840 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE
 // XML Tags ---------------------------------------------------------
 const char _Configuration[]                     = "Configuration";
 const char _Configurations[]                    = "Configurations";
-const char _File[]                              = "File";
+const char q_File[]                              = "File";
 const char _FileConfiguration[]                 = "FileConfiguration";
-const char _Files[]                             = "Files";
+const char q_Files[]                             = "Files";
 const char _Filter[]                            = "Filter";
 const char _Globals[]                           = "Globals";
 const char _Platform[]                          = "Platform";
@@ -2381,11 +2381,11 @@ XmlOutput &operator<<(XmlOutput &xml, VCFilter &tool)
     }
     for (int i = 0; i < tool.Files.count(); ++i) {
         const VCFilterFile &info = tool.Files.at(i);
-        xml << tag(_File)
+        xml << tag(q_File)
                 << attrS(_RelativePath, Option::fixPathToLocalOS(info.file))
             << data(); // In case no custom builds, to avoid "/>" endings
         tool.outputFileConfig(xml, tool.Files.at(i).file);
-        xml << closetag(_File);
+        xml << closetag(q_File);
     }
     if (!tool.Name.isEmpty())
         xml << closetag(_Filter);
@@ -2421,7 +2421,7 @@ XmlOutput &operator<<(XmlOutput &xml, const VCProjectSingleConfig &tool)
             << tag(_Configurations)
             << tool.Configuration;
     xml     << closetag(_Configurations)
-            << tag(_Files);
+            << tag(q_Files);
     // Add this configuration into a multi-config project, since that's where we have the flat/tree
     // XML output functionality
     VCProject tempProj;
@@ -2437,7 +2437,7 @@ XmlOutput &operator<<(XmlOutput &xml, const VCProjectSingleConfig &tool)
         tempProj.outputFilter(xml, tempProj.ExtraCompilers.at(x));
     }
     tempProj.outputFilter(xml, "RootFiles");
-    xml     << closetag(_Files)
+    xml     << closetag(q_Files)
             << tag(_Globals)
                 << data(); // No "/>" end tag
     return xml;
@@ -2492,7 +2492,7 @@ void VCProject::outputFileConfigs(XmlOutput &xml,
                                   const VCFilterFile &info,
                                   const QString &filtername)
 {
-    xml << tag(_File)
+    xml << tag(q_File)
             << attrS(_RelativePath, Option::fixPathToLocalOS(info.file));
     for (int i = 0; i < SingleProjects.count(); ++i) {
         VCFilter filter;
@@ -2520,7 +2520,7 @@ void VCProject::outputFileConfigs(XmlOutput &xml,
         if (filter.Config) // only if the filter is not empty
             filter.outputFileConfig(xml, info.file);
     }
-    xml << closetag(_File);
+    xml << closetag(q_File);
 }
 
 // outputs a given filter for all existing configurations of a project
@@ -2615,7 +2615,7 @@ XmlOutput &operator<<(XmlOutput &xml, VCProject &tool)
     for (int i = 0; i < tool.SingleProjects.count(); ++i)
         xml     << tool.SingleProjects.at(i).Configuration;
     xml     << closetag(_Configurations)
-            << tag(_Files);
+            << tag(q_Files);
     tool.outputFilter(xml, "Sources");
     tool.outputFilter(xml, "Headers");
     tool.outputFilter(xml, "GeneratedFiles");
@@ -2627,7 +2627,7 @@ XmlOutput &operator<<(XmlOutput &xml, VCProject &tool)
         tool.outputFilter(xml, tool.ExtraCompilers.at(x));
     }
     tool.outputFilter(xml, "RootFiles");
-    xml     << closetag(_Files)
+    xml     << closetag(q_Files)
             << tag(_Globals)
             << data(); // No "/>" end tag
     return xml;
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 5f8c4f431..230801736 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -99,8 +99,6 @@ QStringList Option::shellPath;
 Option::TARG_MODE Option::target_mode = Option::TARG_WIN_MODE;
 #elif defined(Q_OS_MAC)
 Option::TARG_MODE Option::target_mode = Option::TARG_MACX_MODE;
-#elif defined(Q_OS_QNX6)
-Option::TARG_MODE Option::target_mode = Option::TARG_QNX6_MODE;
 #else
 Option::TARG_MODE Option::target_mode = Option::TARG_UNIX_MODE;
 #endif
diff --git a/qmake/option.h b/qmake/option.h
index 4205b0304..df2c9400d 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -149,7 +149,7 @@ struct Option
     static int warn_level;
     static bool recursive;
     static QStringList before_user_vars, after_user_vars, user_configs, after_user_configs;
-    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_QNX6_MODE };
+    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE };
     static TARG_MODE target_mode;
     static QString user_template, user_template_prefix;
     static QStringList shellPath;
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 704d8a656..4fefbabc7 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -623,10 +623,6 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0)
             concat << base_concat + QDir::separator() + "mac";
             concat << base_concat + QDir::separator() + "mac9";
             break;
-        case Option::TARG_QNX6_MODE: //also a unix
-            concat << base_concat + QDir::separator() + "qnx6";
-            concat << base_concat + QDir::separator() + "unix";
-            break;
         }
         concat << base_concat;
     }
@@ -1610,13 +1606,11 @@ QMakeProject::isActiveConfig(const QString &x, bool regex, QMap<QString, QString
         return false;
 
     //mkspecs
-    if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE ||
+    if((Option::target_mode == Option::TARG_MACX_MODE ||
         Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
         return true;
     else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx")
         return true;
-    else if(Option::target_mode == Option::TARG_QNX6_MODE && x == "qnx6")
-        return true;
     else if(Option::target_mode == Option::TARG_MAC9_MODE && x == "mac9")
         return true;
     else if((Option::target_mode == Option::TARG_MAC9_MODE || Option::target_mode == Option::TARG_MACX_MODE) &&