1 files changed, 42 insertions, 22 deletions

diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 5ff6250..1515216 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -44,2 +44,18 @@
 
+QString project_builtin_regx() //calculate the builtin regular expression..
+{ 
+    QString ret;
+    QStringList builtin_exts(".c");
+    builtin_exts << Option::ui_ext << Option::yacc_ext << Option::lex_ext << ".ts";
+    builtin_exts += Option::h_ext + Option::cpp_ext;
+    for(QStringList::Iterator ext_it = builtin_exts.begin(); 
+        ext_it != builtin_exts.end(); ++ext_it) {
+        if(!ret.isEmpty())
+            ret += "; ";
+        ret += QString("*") + (*ext_it);
+    }
+    return ret;
+}
+
+
 
@@ -69,17 +85,9 @@ ProjectGenerator::init()
     if(project->first("TEMPLATE_ASSIGN") != "subdirs") {
-        QString builtin_regex;
-        { //calculate the builtin regular expression..
-            QStringList builtin_exts(".c");
-            builtin_exts << Option::ui_ext << Option::yacc_ext << Option::lex_ext;
-            builtin_exts += Option::h_ext + Option::cpp_ext;
-            for(QStringList::Iterator ext_it = builtin_exts.begin(); 
-                ext_it != builtin_exts.end(); ++ext_it) {
-                if(!builtin_regex.isEmpty())
-                    builtin_regex += "; ";
-                builtin_regex += QString("*") + (*ext_it);
-            }
-        }
+        QString builtin_regex = project_builtin_regx();
         QStringList dirs = Option::projfile::project_dirs;
-        if(Option::projfile::do_pwd)
+        if(Option::projfile::do_pwd) {
+            if(!v["INCLUDEPATH"].contains("."))
+                v["INCLUDEPATH"] += ".";
             dirs.prepend(QDir::currentDirPath());
+        }
 
@@ -142,3 +150,3 @@ ProjectGenerator::init()
                 QFileInfo fi(dir);
-                if(fi.absFilePath() != QDir::currentDirPath()) {
+                if(fi.absFilePath() != QDir::currentDirPath()) 
                     v["DEPENDPATH"] += fileFixify(dir);
@@ -147,3 +155,2 @@ ProjectGenerator::init()
         }
-    }
     if(!file_count) { //shall we try a subdir?
@@ -243,4 +250,10 @@ ProjectGenerator::init()
                     for(QStringList::Iterator dep_it = tmp.begin(); dep_it != tmp.end(); ++dep_it) {
-                        QString file_no_path = (*dep_it).right(
-                            (*dep_it).length() - ((*dep_it).findRev(Option::dir_sep)+1));
+                        QString file_dir = (*dep_it).section(Option::dir_sep, 0, -2),
+                            file_no_path = (*dep_it).section(Option::dir_sep, -1);
+                        if(!file_dir.isEmpty()) {
+                            for(MakefileDependDir *mdd = deplist.first(); mdd; mdd = deplist.next()) {
+                                if(mdd->local_dir == file_dir && !v["INCLUDEPATH"].contains(mdd->real_dir))
+                                    v["INCLUDEPATH"] += mdd->real_dir;
+                            }
+                        }
                         if(no_qt_files && file_no_path.find(QRegExp("^q[a-z_0-9].h$")) != -1)
@@ -248,3 +261,4 @@ ProjectGenerator::init()
                         QString h_ext;
-                        for(QStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) {
+                        for(QStringList::Iterator hit = Option::h_ext.begin(); 
+                            hit != Option::h_ext.end(); ++hit) {
                             if((*dep_it).endsWith((*hit))) {
@@ -262,3 +276,4 @@ ProjectGenerator::init()
                                 cppit != Option::cpp_ext.end(); ++cppit) {
-                                QString src((*dep_it).left((*dep_it).length() - h_ext.length()) + (*cppit));
+                                QString src((*dep_it).left((*dep_it).length() - h_ext.length()) + 
+                                            (*cppit));
                                 if(QFile::exists(src)) {
@@ -266,3 +281,4 @@ ProjectGenerator::init()
                                     QStringList &srcl = v["SOURCES"];
-                                    for(QStringList::Iterator src_it = srcl.begin(); src_it != srcl.end(); ++src_it) {
+                                    for(QStringList::Iterator src_it = srcl.begin(); 
+                                        src_it != srcl.end(); ++src_it) {
                                         if((*src_it).lower() == src.lower()) {
@@ -339,3 +355,4 @@ ProjectGenerator::writeMakefile(QTextStream &t)
           << getWritableVar("CONFIG_REMOVE", FALSE)
-          << getWritableVar("DEPENDPATH") << endl;
+          << getWritableVar("DEPENDPATH")
+          << getWritableVar("INCLUDEPATH") << endl;
 
@@ -346,3 +363,4 @@ ProjectGenerator::writeMakefile(QTextStream &t)
           << getWritableVar("YACCSOURCES") 
-          << getWritableVar("SOURCES");
+          << getWritableVar("SOURCES")
+          << getWritableVar("TRANSLATIONS");
     }
@@ -405,2 +423,4 @@ ProjectGenerator::addFile(QString file)
             where = "YACCSOURCES";
+        else if(file.endsWith(".ts"))
+            where = "TRANSLATIONS";
     }