update qmake to 1.05a

1 files changed, 104 insertions, 49 deletions

diff --git a/qmake/option.cpp b/qmake/option.cpp
index 34b3ee2..8b7e5e8 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -84,3 +84,3 @@ Option::TARG_MODE Option::target_mode = Option::TARG_UNIX_MODE;
 bool Option::projfile::do_pwd = TRUE;
-bool Option::projfile::do_recursive = FALSE;
+bool Option::projfile::do_recursive = TRUE;
 QStringList Option::projfile::project_dirs;
@@ -99,2 +99,13 @@ QString Option::mkfile::qmakespec_commandline;
 
+static Option::QMAKE_MODE default_mode(QString progname)
+{
+    int s = progname.findRev(Option::dir_sep);
+    if(s != -1)
+        progname = progname.right(progname.length() - (s + 1));
+    if(progname == "qmakegen")
+        return Option::QMAKE_GENERATE_PROJECT;
+    return Option::QMAKE_GENERATE_MAKEFILE;
+}
+
+QString project_builtin_regx();
 bool usage(const char *a0)
@@ -109,7 +120,7 @@ bool usage(const char *a0)
             "Mode:\n"
-            "\t-project       Put qmake into project file generation mode\n"
+            "\t-project       Put qmake into project file generation mode%s\n"
             "\t               In this mode qmake interprets files as files to\n"
             "\t               be built,\n"
-            "\t               defaults to *.cpp; *.l; *.y; *.ui\n"
-            "\t-makefile      Put qmake into makefile generation mode (default)\n"
+            "\t               defaults to %s\n"
+            "\t-makefile      Put qmake into makefile generation mode%s\n"
             "\t               In this mode qmake interprets files as project files to\n"
@@ -138,3 +149,3 @@ bool usage(const char *a0)
             "\t-after         All variable assignments after this will be\n"
-            "\t               parsed after [files]        [makefile mode only]\n"
+            "\t               parsed after [files]\n"
             "\t-cache file    Use file as cache           [makefile mode only]\n"
@@ -145,22 +156,14 @@ bool usage(const char *a0)
             "\t-nopwd         Don't look for files in pwd [ project mode only]\n"
-            "\t-r             Recursive search            [ project mode only]\n"
-            ,a0);
+            "\t-norecursive   Don't do a recursive search [ project mode only]\n"
+            ,a0, 
+            default_mode(a0) == Option::QMAKE_GENERATE_PROJECT  ? " (default)" : "", project_builtin_regx().latin1(),
+            default_mode(a0) == Option::QMAKE_GENERATE_MAKEFILE ? " (default)" : "");
     return FALSE;
 }
-static Option::QMAKE_MODE default_mode(QString progname)
-{
-    int s = progname.findRev(Option::dir_sep);
-    if(s != -1)
-        progname = progname.right(progname.length() - (s + 1));
-    if(progname == "qmakegen")
-        return Option::QMAKE_GENERATE_PROJECT;
-    return Option::QMAKE_GENERATE_MAKEFILE;
-}
-
 
 bool
-Option::parseCommandLine(int argc, char **argv)
+Option::internalParseCommandLine(int argc, char **argv, int skip)
 {
     bool before = TRUE;
-    for(int x = 1; x < argc; x++) {
+    for(int x = skip; x < argc; x++) {
         if(*argv[x] == '-' && strlen(argv[x]) > 1) { /* options */
@@ -181,3 +184,2 @@ Option::parseCommandLine(int argc, char **argv)
                     specified = FALSE;
-                    Option::qmake_mode = default_mode(argv[0]);
                 }
@@ -206,3 +208,3 @@ Option::parseCommandLine(int argc, char **argv)
             } else if(opt == "version" || opt == "v" || opt == "-version") {
-                fprintf(stderr, "Qmake version: %s\n", qmake_version());
+                fprintf(stderr, "Qmake version: %s (Qt %s)\n", qmake_version(), QT_VERSION_STR);
                 fprintf(stderr, "Qmake is free software from Trolltech AS.\n");
@@ -210,3 +212,3 @@ Option::parseCommandLine(int argc, char **argv)
             } else if(opt == "h" || opt == "help") {
-                return usage(argv[0]);
+                return FALSE;
             } else if(opt == "Wall") {
@@ -246,5 +248,7 @@ Option::parseCommandLine(int argc, char **argv)
                         Option::projfile::do_recursive = TRUE;
+                    } else if(opt == "norecursive") {
+                        Option::projfile::do_recursive = FALSE;
                     } else {
                         fprintf(stderr, "***Unknown option -%s\n", opt.latin1());
-                        return usage(argv[0]);
+                        return FALSE;
                     }
@@ -253,5 +257,2 @@ Option::parseCommandLine(int argc, char **argv)
         } else {
-            if(x == 1)
-                Option::qmake_mode = default_mode(argv[0]);
-
             QString arg = argv[x];
@@ -274,4 +275,65 @@ Option::parseCommandLine(int argc, char **argv)
     }
+    return TRUE;
+}
+
+
+bool
+Option::parseCommandLine(int argc, char **argv)
+{
+    Option::moc_mod = "moc_";
+    Option::lex_mod = "_lex";
+    Option::yacc_mod = "_yacc";
+    Option::prl_ext = ".prl";
+    Option::prf_ext = ".prf";
+    Option::ui_ext = ".ui";
+    Option::h_ext << ".h" << ".hpp" << ".hh" << ".H" << ".hxx";
+    Option::moc_ext = ".moc";
+    Option::cpp_ext << ".cpp" << ".cc" << ".cxx" << ".C";
+    Option::lex_ext = ".l";
+    Option::yacc_ext = ".y";
+
     if(Option::qmake_mode == Option::QMAKE_GENERATE_NOTHING)
         Option::qmake_mode = default_mode(argv[0]);
+    if(const char *envflags = getenv("QMAKEFLAGS")) {
+        int env_argc = 0, env_size = 0, currlen=0;
+        char quote = 0, **env_argv = NULL;
+        for(int i = 0; envflags[i]; i++) {
+            if(!quote && (envflags[i] == '\'' || envflags[i] == '"')) {
+                quote = envflags[i];
+            } else if(envflags[i] == quote) {
+                quote = 0;
+            } else if(!quote && envflags[i] == ' ') {
+                if(currlen && env_argv && env_argv[env_argc]) {
+                    env_argv[env_argc][currlen] = '\0';
+                    currlen = 0;
+                    env_argc++;
+                }
+            } else {
+                if(!env_argv || env_argc > env_size) {
+                    env_argv = (char **)realloc(env_argv, sizeof(char *)*(env_size+=10));
+                    for(int i2 = env_argc; i2 < env_size; i2++)
+                        env_argv[i2] = NULL;
+                }
+                if(!env_argv[env_argc]) {
+                    currlen = 0;
+                    env_argv[env_argc] = (char*)malloc(255);
+                }
+                if(currlen < 255) 
+                    env_argv[env_argc][currlen++] = envflags[i];
+            }
+        }
+        if(env_argv[env_argc]) {
+            env_argv[env_argc][currlen] = '\0';
+            currlen = 0;
+            env_argc++;
+        }
+        internalParseCommandLine(env_argc, env_argv);
+        for(int i2 = 0; i2 < env_size; i2++) {
+            if(env_argv[i2])
+                free(env_argv[i2]);
+        }
+        free(env_argv);
+    }
+    if(!internalParseCommandLine(argc, argv, 1))
+        return usage(argv[0]);
 
@@ -285,8 +347,12 @@ Option::parseCommandLine(int argc, char **argv)
         if(Option::mkfile::project_files.isEmpty()) {
-            QString proj = QDir::currentDirPath();
-            proj = proj.right(proj.length() - (proj.findRev('/') + 1)) + ".pro";
-            if(QFile::exists(proj))
+            QString pwd = QDir::currentDirPath(), 
+                   proj = pwd + "/" + pwd.right(pwd.length() - (pwd.findRev('/') + 1)) + ".pro";
+            if(QFile::exists(proj)) {
                 Option::mkfile::project_files.append(proj);
-            else
-                return usage(argv[0]);
+            } else { //last try..
+                QDir d(pwd, "*.pro");
+                if(d.count() != 1)
+                    return usage(argv[0]);
+                Option::mkfile::project_files.append(pwd + "/" + d[0]);
+            }
         }
@@ -295,13 +361,2 @@ Option::parseCommandLine(int argc, char **argv)
     //defaults for globals
-    Option::moc_mod = "moc_";
-    Option::lex_mod = "_lex";
-    Option::yacc_mod = "_yacc";
-    Option::prl_ext = ".prl";
-    Option::prf_ext = ".prf";
-    Option::ui_ext = ".ui";
-    Option::h_ext << ".h" << ".hpp" << ".hh" << ".H" << ".hxx";
-    Option::moc_ext = ".moc";
-    Option::cpp_ext << ".cpp" << ".cc" << ".cxx" << ".C";
-    Option::lex_ext = ".l";
-    Option::yacc_ext = ".y";
     if(Option::target_mode == Option::TARG_WIN_MODE) {
@@ -388,9 +443,9 @@ Option::fixPathToTargetOS(const QString& in, bool fix_env, bool canonical)
     QString rep;
-    if(Option::target_mode == TARG_MAC9_MODE)
-        rep = "[/\\\\]";
-    else if(Option::target_mode == TARG_WIN_MODE)
-        rep = "[/]";
-    else
-        rep = "[\\\\]";
-    return tmp.replace(QRegExp(rep), Option::dir_sep);
+    if(Option::target_mode == TARG_MAC9_MODE) 
+        tmp = tmp.replace('/', Option::dir_sep).replace('\\', Option::dir_sep);
+    else if(Option::target_mode == TARG_WIN_MODE) 
+        tmp = tmp.replace('/', Option::dir_sep);
+    else 
+        tmp = tmp.replace('\\', Option::dir_sep);
+    return tmp;
 }