Manually updatet to qmake1.06a which includes support for precompiled

headers.
Opies 'PRO' keyword was already reintroduced

1 files changed, 15 insertions, 8 deletions

diff --git a/qmake/project.h b/qmake/project.h
index ec19f0c..0ca2a92 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -1,12 +1,10 @@
 /****************************************************************************
-** $Id$
+** 
 **
-** Definition of ________ class.
+** Definition of QMakeProject class.
 **
-** Created : 970521
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the network module of the Qt GUI Toolkit.
+** This file is part of qmake.
 **
 ** This file may be distributed under the terms of the Q Public License
@@ -35,4 +33,5 @@
 **
 **********************************************************************/
+
 #ifndef __PROJECT_H__
 #define __PROJECT_H__
@@ -42,4 +41,6 @@
 #include <qmap.h>
 
+class QMakeProperty;
+
 class QMakeProject
 {
@@ -48,4 +49,6 @@ class QMakeProject
 
     QString pfile, cfile;
+    QMakeProperty *prop;
+    void reset();
     QMap<QString, QStringList> vars, base_vars, cache;
     bool parse(const QString &text, QMap<QString, QStringList> &place);
@@ -57,6 +60,10 @@ class QMakeProject
 public:
     QMakeProject();
+    QMakeProject(QMakeProperty *);
+
+    enum { ReadCache=0x01, ReadConf=0x02, ReadCmdLine=0x04, ReadProFile=0x08, ReadPostFiles=0x10, ReadAll=0xFF };
+    bool read(const QString &project, const QString &pwd, uchar cmd=ReadAll);
+    bool read(uchar cmd=ReadAll);
 
-    bool read(const QString &project, const QString &pwd, bool just_project=FALSE);
     QString projectFile();
     QString configFile();
@@ -66,5 +73,5 @@ public:
     QString first(const QString &v);
     QMap<QString, QStringList> &variables();
-    bool isActiveConfig(const QString &x, bool regex=FALSE);
+    bool isActiveConfig(const QString &x, bool regex=FALSE, QMap<QString, QStringList> *place=NULL);
 
 protected: