author | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
commit | 155d68c1e7d7dc0fed2534ac43d6d77ce2781f55 (patch) (unidiff) | |
tree | e6edaa5a7040fe6c224c3943d1094dcf02e4f74c /qmake/option.h | |
parent | 86703e8a5527ef114facd02c005b6b3a7e62e263 (diff) | |
download | opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.zip opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.gz opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.bz2 |
update qmake to 1.05a
-rw-r--r-- | qmake/option.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/option.h b/qmake/option.h index 9a5a85a..8bd348e 100644 --- a/qmake/option.h +++ b/qmake/option.h | |||
@@ -34,25 +34,25 @@ | |||
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | #ifndef __OPTION_H__ | 37 | #ifndef __OPTION_H__ |
38 | #define __OPTION_H__ | 38 | #define __OPTION_H__ |
39 | 39 | ||
40 | #include "project.h" | 40 | #include "project.h" |
41 | #include <qstring.h> | 41 | #include <qstring.h> |
42 | #include <qstringlist.h> | 42 | #include <qstringlist.h> |
43 | #include <qfile.h> | 43 | #include <qfile.h> |
44 | 44 | ||
45 | #define QMAKE_VERSION_MAJOR 1 | 45 | #define QMAKE_VERSION_MAJOR 1 |
46 | #define QMAKE_VERSION_MINOR 4 | 46 | #define QMAKE_VERSION_MINOR 5 |
47 | #define QMAKE_VERSION_PATCH 0 | 47 | #define QMAKE_VERSION_PATCH 0 |
48 | const char *qmake_version(); | 48 | const char *qmake_version(); |
49 | 49 | ||
50 | void fixEnvVariables(QString &x); | 50 | void fixEnvVariables(QString &x); |
51 | void debug_msg(int level, const char *fmt, ...); | 51 | void debug_msg(int level, const char *fmt, ...); |
52 | enum QMakeWarn { | 52 | enum QMakeWarn { |
53 | WarnNone = 0x00, | 53 | WarnNone = 0x00, |
54 | WarnParser = 0x01, | 54 | WarnParser = 0x01, |
55 | WarnLogic = 0x02, | 55 | WarnLogic = 0x02, |
56 | WarnAll = 0xFF | 56 | WarnAll = 0xFF |
57 | }; | 57 | }; |
58 | void warn_msg(QMakeWarn t, const char *fmt, ...); | 58 | void warn_msg(QMakeWarn t, const char *fmt, ...); |
@@ -107,16 +107,19 @@ struct Option | |||
107 | struct mkfile { | 107 | struct mkfile { |
108 | static QString qmakespec; | 108 | static QString qmakespec; |
109 | static bool do_cache; | 109 | static bool do_cache; |
110 | static bool do_deps; | 110 | static bool do_deps; |
111 | static bool do_mocs; | 111 | static bool do_mocs; |
112 | static bool do_dep_heuristics; | 112 | static bool do_dep_heuristics; |
113 | static bool do_preprocess; | 113 | static bool do_preprocess; |
114 | static QString cachefile; | 114 | static QString cachefile; |
115 | static int cachefile_depth; | 115 | static int cachefile_depth; |
116 | static QStringList project_files; | 116 | static QStringList project_files; |
117 | static QString qmakespec_commandline; | 117 | static QString qmakespec_commandline; |
118 | }; | 118 | }; |
119 | |||
120 | private: | ||
121 | static bool internalParseCommandLine(int, char **, int=0); | ||
119 | }; | 122 | }; |
120 | 123 | ||
121 | 124 | ||
122 | #endif /* __OPTION_H__ */ | 125 | #endif /* __OPTION_H__ */ |