1 files changed, 23 insertions, 17 deletions

diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 1515216..1c17379 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -1,16 +1,14 @@
 /****************************************************************************
-** $Id$
+** 
 **
-** Definition of ________ class.
+** Implementation of ProjectGenerator class.
 **
-** Created : 970521
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
-** Copyright (C) 1992-2000 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
@@ -154,12 +152,13 @@ ProjectGenerator::init()
         }
     }
     if(!file_count) { //shall we try a subdir?
         QStringList dirs = Option::projfile::project_dirs;
         if(Option::projfile::do_pwd)
             dirs.prepend(".");
+        const QString out_file = fileFixify(Option::output.name());
         for(QStringList::Iterator pd = dirs.begin(); pd != dirs.end(); pd++) {
             if(QFile::exists((*pd))) {
                 QString newdir = (*pd);
                 QFileInfo fi(newdir);
                 if(fi.isDir()) {
                     newdir = fileFixify(newdir);
@@ -168,18 +167,21 @@ ProjectGenerator::init()
                        !subdirs.contains(newdir)) {
                         subdirs.append(newdir);
                     } else {
                         QDir d(newdir, "*.pro");
                         d.setFilter(QDir::Files);
                         for(int i = 0; i < (int)d.count(); i++) {
-                            QString nd = newdir + QDir::separator() + d[i];
+                            QString nd = newdir;
+                            if(nd == ".")
+                                nd = "";
+                            else if(!nd.isEmpty() && !nd.endsWith(QString(QChar(QDir::separator()))))
+                                nd += QDir::separator();
+                            nd += d[i];
                             fileFixify(nd);
-                            if(d[i] != "." && d[i] != ".." && !subdirs.contains(nd)) {
-                                if(newdir + d[i] != Option::output_dir + Option::output.name())
-                                    subdirs.append(nd);
-                            }
+                            if(d[i] != "." && d[i] != ".." && !subdirs.contains(nd) && !out_file.endsWith(nd)) 
+                                subdirs.append(nd);
                         }
                     }
                     if(Option::projfile::do_recursive) {
                         QDir d(newdir);
                         d.setFilter(QDir::Dirs);
                         for(int i = 0; i < (int)d.count(); i++) {
@@ -321,13 +323,13 @@ ProjectGenerator::init()
                     QString u1 = (*ui_it).right((*ui_it).length() - ((*ui_it).findRev(Option::dir_sep) + 1));
                     if(s1 == u1) {
                         found = TRUE;
                         break;
                     }
                 }
-                if(!found && (*val_it).endsWith(Option::moc_ext))
+                if(!found && (*val_it).endsWith(Option::cpp_moc_ext))
                     found = TRUE;
                 if(found)
                     val_it = l.remove(val_it);
                 else
                     ++val_it;
             }
@@ -388,13 +390,13 @@ ProjectGenerator::addFile(QString file)
 {
     file = fileFixify(file, QDir::currentDirPath());
     QString dir;
     int s = file.findRev(Option::dir_sep);
     if(s != -1)
         dir = file.left(s+1);
-    if(file.mid(dir.length(), Option::moc_mod.length()) == Option::moc_mod)
+    if(file.mid(dir.length(), Option::h_moc_mod.length()) == Option::h_moc_mod)
         return FALSE;
 
     QString where;
     for(QStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) {
         if(file.endsWith((*cppit))) {
             if(QFile::exists(file.left(file.length() - (*cppit).length()) + Option::ui_ext))
@@ -432,13 +434,13 @@ ProjectGenerator::addFile(QString file)
     }
     return FALSE;
 }
 
 
 QString
-ProjectGenerator::getWritableVar(const QString &v, bool /*fixPath*/)
+ProjectGenerator::getWritableVar(const QString &v, bool fixPath)
 {
     QStringList &vals = project->variables()[v];
     if(vals.isEmpty())
         return "";
 
     QString ret;
@@ -452,16 +454,20 @@ ProjectGenerator::getWritableVar(const QString &v, bool /*fixPath*/)
     if(ret.length() + join.length() > 80) {
         QString spaces;
         for(unsigned int i = 0; i < ret.length(); i++)
             spaces += " ";
         join = vals.join(" \\\n" + spaces);
     } 
+#if 0
     // ### Commented out for now so that project generation works.
-    // Sam: can you look at why this was needed?
-    /*    if(fixPath)
-        join = join.replace("\\", "/");*/
+    // Sam: it had to do with trailing \'s (ie considered continuation lines)
+    if(fixPath)
+        join = join.replace("\\", "/");
+#else
+    Q_UNUSED(fixPath);
+#endif
     return ret + join + "\n";
 }
 
 bool
 ProjectGenerator::openOutput(QFile &file) const
 {