1 files changed, 9 insertions, 12 deletions

diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 125749d..baaeeec 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -1,16 +1,14 @@
 /****************************************************************************
-** $Id$
 **
-** Definition of ________ class.
 **
-** Created : 970521
+** Implementation of MetrowerksMakefileGenerator class.
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of the network module of the Qt GUI Toolkit.
+** This file is part of qmake.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
@@ -39,19 +37,18 @@
 #include "option.h"
 #include <qdir.h>
 #include <qdict.h>
 #include <qregexp.h>
 #include <stdlib.h>
 #include <time.h>
-#ifdef Q_OS_MAC
+#if !defined(QWS) && defined(Q_OS_MAC)
 #include <Carbon/Carbon.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #endif
 
-
 MetrowerksMakefileGenerator::MetrowerksMakefileGenerator(QMakeProject *p) : MakefileGenerator(p), init_flag(FALSE)
 {
 
 }
 
 bool
@@ -604,13 +601,13 @@ MetrowerksMakefileGenerator::init()
             project->first("QMAKE_ENTRYPOINT"));
     }
 }
 
 
 QString
-MetrowerksMakefileGenerator::findTemplate(QString file)
+MetrowerksMakefileGenerator::findTemplate(const QString &file)
 {
     QString ret;
     if(!QFile::exists(ret = file) && 
        !QFile::exists((ret = Option::mkfile::qmakespec + QDir::separator() + file)) && 
        !QFile::exists((ret = QString(getenv("QTDIR")) + "/mkspecs/mac-mwerks/" + file)) &&
        !QFile::exists((ret = (QString(getenv("HOME")) + "/.tmake/" + file))))
@@ -618,13 +615,13 @@ MetrowerksMakefileGenerator::findTemplate(QString file)
     return ret;
 }
 
 bool
 MetrowerksMakefileGenerator::createFork(const QString &f)
 {
-#if defined(Q_OS_MACX)
+#if !defined(QWS) && defined(Q_OS_MACX)
     FSRef fref;
     FSSpec fileSpec;
     if(QFile::exists(f)) {
         mode_t perms = 0;
         {
             struct stat s;
@@ -661,13 +658,13 @@ MetrowerksMakefileGenerator::fixifyToMacPath(QString &p, QString &v, bool )
     if(p.find(':') != -1) //guess its macish already
         return TRUE;
 
     static QString st_volume;
     if(st_volume.isEmpty()) {
         st_volume = var("QMAKE_VOLUMENAME");
-#ifdef Q_OS_MAC
+#if !defined(QWS) && defined(Q_OS_MACX)
         if(st_volume.isEmpty()) {
             uchar foo[512];
             HVolumeParam pb;
             memset(&pb, '\0', sizeof(pb));
             pb.ioVRefNum = 0;
             pb.ioNamePtr = foo;
@@ -730,13 +727,13 @@ MetrowerksMakefileGenerator::processPrlFiles()
                         fixEnvVariables(l);
                         libdirs.append(new MakefileDependDir(r.replace( "\"", ""),
                                                              l.replace( "\"", "")));
                     } else if(opt.left(2) == "-l") {
                         QString lib = opt.right(opt.length() - 2), prl;
                         for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
-                            prl = mdd->local_dir + Option::dir_sep + "lib" + lib + Option::prl_ext;
+                            prl = mdd->local_dir + Option::dir_sep + "lib" + lib;
                             if(processPrlFile(prl)) {
                                 if(prl.startsWith(mdd->local_dir))
                                     prl.replace(0, mdd->local_dir.length(), mdd->real_dir);
                                 QRegExp reg("^.*lib(" + lib + "[^.]*)\\." + 
                                             project->first("QMAKE_EXTENSION_SHLIB") + "$");
                                 if(reg.exactMatch(prl))
@@ -748,13 +745,13 @@ MetrowerksMakefileGenerator::processPrlFiles()
                         }
                     } else if(opt == "-framework") {
                         l_out.append(opt);
                         ++it;
                         opt = (*it);
                         QString prl = "/System/Library/Frameworks/" + opt +
-                                      ".framework/" + opt + Option::prl_ext;
+                                      ".framework/" + opt;
                         if(processPrlFile(prl))
                             ret = TRUE;
                     }
                     if(!opt.isEmpty())
                         l_out.append(opt);
                 } else {