--- a/qmake/option.h	Mon Jun 21 22:38:13 2010 +0100
+++ b/qmake/option.h	Thu Jul 22 16:41:55 2010 +0100
@@ -63,6 +63,7 @@
     WarnNone    = 0x00,
     WarnParser  = 0x01,
     WarnLogic   = 0x02,
+    WarnDeprecated = 0x04,
     WarnAll     = 0xFF
 };
 void warn_msg(QMakeWarn t, const char *fmt, ...);
@@ -106,6 +107,7 @@
 
     //both of these must be called..
     static int init(int argc=0, char **argv=0); //parse cmdline
+    static void applyHostMode();
     static bool postProcessProject(QMakeProject *);
 
     enum StringFixFlags {
@@ -148,10 +150,15 @@
     static QString output_dir;
     static int debug_level;
     static int warn_level;
-    static bool recursive;
+    enum QMAKE_RECURSIVE { QMAKE_RECURSIVE_DEFAULT, QMAKE_RECURSIVE_YES, QMAKE_RECURSIVE_NO };
+    static QMAKE_RECURSIVE recursive;
     static QStringList before_user_vars, after_user_vars, user_configs, after_user_configs;
-    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE };
+    enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE };
+    static HOST_MODE host_mode;
+    enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE,
+                     TARG_SYMBIAN_MODE };
     static TARG_MODE target_mode;
+    static bool target_mode_overridden;
     static QString user_template, user_template_prefix;
     static QStringList shellPath;
 
@@ -206,7 +213,8 @@
         TranslationsPath,
         SettingsPath,
         DemosPath,
-        ExamplesPath
+        ExamplesPath,
+        ImportsPath
     };
     static QString location(LibraryLocation);
 };