author | zecke <zecke> | 2004-07-15 17:36:57 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-15 17:36:57 (UTC) |
commit | 323e9a7472a110b4befba7320540263147505bae (patch) (unidiff) | |
tree | 14c810bdb9c0603a30356b17b4bdf9ccb72741c6 /qmake/option.h | |
parent | aa292b322f1ecb43dd8f4e3cd295855730dd9f59 (diff) | |
download | opie-323e9a7472a110b4befba7320540263147505bae.zip opie-323e9a7472a110b4befba7320540263147505bae.tar.gz opie-323e9a7472a110b4befba7320540263147505bae.tar.bz2 |
Manually updatet to qmake1.06a which includes support for precompiled
headers.
Opies 'PRO' keyword was already reintroduced
-rw-r--r-- | qmake/option.h | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/qmake/option.h b/qmake/option.h index 8bd348e..6197605 100644 --- a/qmake/option.h +++ b/qmake/option.h | |||
@@ -1,14 +1,12 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Definition of Option class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
@@ -33,8 +31,9 @@ | |||
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | |||
37 | #ifndef __OPTION_H__ | 36 | #ifndef __OPTION_H__ |
38 | #define __OPTION_H__ | 37 | #define __OPTION_H__ |
39 | 38 | ||
40 | #include "project.h" | 39 | #include "project.h" |
@@ -42,9 +41,9 @@ | |||
42 | #include <qstringlist.h> | 41 | #include <qstringlist.h> |
43 | #include <qfile.h> | 42 | #include <qfile.h> |
44 | 43 | ||
45 | #define QMAKE_VERSION_MAJOR 1 | 44 | #define QMAKE_VERSION_MAJOR 1 |
46 | #define QMAKE_VERSION_MINOR 5 | 45 | #define QMAKE_VERSION_MINOR 7 |
47 | #define QMAKE_VERSION_PATCH 0 | 46 | #define QMAKE_VERSION_PATCH 0 |
48 | const char *qmake_version(); | 47 | const char *qmake_version(); |
49 | 48 | ||
50 | void fixEnvVariables(QString &x); | 49 | void fixEnvVariables(QString &x); |
@@ -59,18 +58,22 @@ void warn_msg(QMakeWarn t, const char *fmt, ...); | |||
59 | 58 | ||
60 | struct Option | 59 | struct Option |
61 | { | 60 | { |
62 | //simply global convenience | 61 | //simply global convenience |
62 | static QString libtool_ext; | ||
63 | static QString pkgcfg_ext; | ||
63 | static QString prf_ext; | 64 | static QString prf_ext; |
64 | static QString prl_ext; | 65 | static QString prl_ext; |
65 | static QString ui_ext; | 66 | static QString ui_ext; |
66 | static QStringList h_ext; | 67 | static QStringList h_ext; |
67 | static QStringList cpp_ext; | 68 | static QStringList cpp_ext; |
68 | static QString moc_ext; | 69 | static QString h_moc_ext; |
70 | static QString cpp_moc_ext; | ||
69 | static QString obj_ext; | 71 | static QString obj_ext; |
70 | static QString lex_ext; | 72 | static QString lex_ext; |
71 | static QString yacc_ext; | 73 | static QString yacc_ext; |
72 | static QString moc_mod; | 74 | static QString h_moc_mod; |
75 | static QString cpp_moc_mod; | ||
73 | static QString lex_mod; | 76 | static QString lex_mod; |
74 | static QString yacc_mod; | 77 | static QString yacc_mod; |
75 | static QString dir_sep; | 78 | static QString dir_sep; |
76 | //both of these must be called.. | 79 | //both of these must be called.. |
@@ -82,9 +85,9 @@ struct Option | |||
82 | static QString fixPathToTargetOS(const QString& in, bool fix_env=TRUE, bool canonical=TRUE); | 85 | static QString fixPathToTargetOS(const QString& in, bool fix_env=TRUE, bool canonical=TRUE); |
83 | 86 | ||
84 | //global qmake mode, can only be in one mode per invocation! | 87 | //global qmake mode, can only be in one mode per invocation! |
85 | enum QMAKE_MODE { QMAKE_GENERATE_NOTHING, QMAKE_GENERATE_PROJECT, QMAKE_GENERATE_MAKEFILE, | 88 | enum QMAKE_MODE { QMAKE_GENERATE_NOTHING, QMAKE_GENERATE_PROJECT, QMAKE_GENERATE_MAKEFILE, |
86 | QMAKE_GENERATE_PRL }; | 89 | QMAKE_GENERATE_PRL, QMAKE_SET_PROPERTY, QMAKE_QUERY_PROPERTY }; |
87 | static QMAKE_MODE qmake_mode; | 90 | static QMAKE_MODE qmake_mode; |
88 | 91 | ||
89 | //all modes | 92 | //all modes |
90 | static QFile output; | 93 | static QFile output; |
@@ -95,8 +98,14 @@ struct Option | |||
95 | enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_QNX6_MODE }; | 98 | enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_QNX6_MODE }; |
96 | static TARG_MODE target_mode; | 99 | static TARG_MODE target_mode; |
97 | static QString user_template, user_template_prefix; | 100 | static QString user_template, user_template_prefix; |
98 | 101 | ||
102 | |||
103 | //QMAKE_*_PROPERTY options | ||
104 | struct prop { | ||
105 | static QStringList properties; | ||
106 | }; | ||
107 | |||
99 | //QMAKE_GENERATE_PROJECT options | 108 | //QMAKE_GENERATE_PROJECT options |
100 | struct projfile { | 109 | struct projfile { |
101 | static bool do_pwd; | 110 | static bool do_pwd; |
102 | static bool do_recursive; | 111 | static bool do_recursive; |
@@ -117,9 +126,9 @@ struct Option | |||
117 | static QString qmakespec_commandline; | 126 | static QString qmakespec_commandline; |
118 | }; | 127 | }; |
119 | 128 | ||
120 | private: | 129 | private: |
121 | static bool internalParseCommandLine(int, char **, int=0); | 130 | static int internalParseCommandLine(int, char **, int=0); |
122 | }; | 131 | }; |
123 | 132 | ||
124 | 133 | ||
125 | #endif /* __OPTION_H__ */ | 134 | #endif /* __OPTION_H__ */ |