-rw-r--r-- | qmake/project.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/qmake/project.h b/qmake/project.h index ec19f0c..0ca2a92 100644 --- a/qmake/project.h +++ b/qmake/project.h | |||
@@ -1,11 +1,9 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | ||
3 | ** | 2 | ** |
4 | ** Definition of ________ class. | ||
5 | ** | 3 | ** |
6 | ** Created : 970521 | 4 | ** Definition of QMakeProject class. |
7 | ** | 5 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
9 | ** | 7 | ** |
10 | ** This file is part of the network module of the Qt GUI Toolkit. | 8 | ** This file is part of qmake. |
11 | ** | 9 | ** |
@@ -36,2 +34,3 @@ | |||
36 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | |||
37 | #ifndef __PROJECT_H__ | 36 | #ifndef __PROJECT_H__ |
@@ -43,2 +42,4 @@ | |||
43 | 42 | ||
43 | class QMakeProperty; | ||
44 | |||
44 | class QMakeProject | 45 | class QMakeProject |
@@ -49,2 +50,4 @@ class QMakeProject | |||
49 | QString pfile, cfile; | 50 | QString pfile, cfile; |
51 | QMakeProperty *prop; | ||
52 | void reset(); | ||
50 | QMap<QString, QStringList> vars, base_vars, cache; | 53 | QMap<QString, QStringList> vars, base_vars, cache; |
@@ -58,4 +61,8 @@ public: | |||
58 | QMakeProject(); | 61 | QMakeProject(); |
62 | QMakeProject(QMakeProperty *); | ||
63 | |||
64 | enum { ReadCache=0x01, ReadConf=0x02, ReadCmdLine=0x04, ReadProFile=0x08, ReadPostFiles=0x10, ReadAll=0xFF }; | ||
65 | bool read(const QString &project, const QString &pwd, uchar cmd=ReadAll); | ||
66 | bool read(uchar cmd=ReadAll); | ||
59 | 67 | ||
60 | bool read(const QString &project, const QString &pwd, bool just_project=FALSE); | ||
61 | QString projectFile(); | 68 | QString projectFile(); |
@@ -67,3 +74,3 @@ public: | |||
67 | QMap<QString, QStringList> &variables(); | 74 | QMap<QString, QStringList> &variables(); |
68 | bool isActiveConfig(const QString &x, bool regex=FALSE); | 75 | bool isActiveConfig(const QString &x, bool regex=FALSE, QMap<QString, QStringList> *place=NULL); |
69 | 76 | ||