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,12 +1,10 @@
 /****************************************************************************
-** $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
@@ -43,5 +41,5 @@
 #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>
@@ -49,5 +47,4 @@
 #endif
 
-
 MetrowerksMakefileGenerator::MetrowerksMakefileGenerator(QMakeProject *p) : MakefileGenerator(p), init_flag(FALSE)
 {
@@ -608,5 +605,5 @@ MetrowerksMakefileGenerator::init()
 
 QString
-MetrowerksMakefileGenerator::findTemplate(QString file)
+MetrowerksMakefileGenerator::findTemplate(const QString &file)
 {
     QString ret;
@@ -622,5 +619,5 @@ bool
 MetrowerksMakefileGenerator::createFork(const QString &f)
 {
-#if defined(Q_OS_MACX)
+#if !defined(QWS) && defined(Q_OS_MACX)
     FSRef fref;
     FSSpec fileSpec;
@@ -665,5 +662,5 @@ MetrowerksMakefileGenerator::fixifyToMacPath(QString &p, QString &v, bool )
     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];
@@ -734,5 +731,5 @@ MetrowerksMakefileGenerator::processPrlFiles()
                         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))
@@ -752,5 +749,5 @@ MetrowerksMakefileGenerator::processPrlFiles()
                         opt = (*it);
                         QString prl = "/System/Library/Frameworks/" + opt +
-                                      ".framework/" + opt + Option::prl_ext;
+                                      ".framework/" + opt;
                         if(processPrlFile(prl))
                             ret = TRUE;