author | zecke <zecke> | 2004-07-15 17:36:57 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-15 17:36:57 (UTC) |
commit | 323e9a7472a110b4befba7320540263147505bae (patch) (side-by-side diff) | |
tree | 14c810bdb9c0603a30356b17b4bdf9ccb72741c6 /qmake/project.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/project.h | 23 |
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,11 +1,9 @@ /**************************************************************************** -** $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. ** @@ -36,2 +34,3 @@ **********************************************************************/ + #ifndef __PROJECT_H__ @@ -43,2 +42,4 @@ +class QMakeProperty; + class QMakeProject @@ -49,2 +50,4 @@ class QMakeProject QString pfile, cfile; + QMakeProperty *prop; + void reset(); QMap<QString, QStringList> vars, base_vars, cache; @@ -58,4 +61,8 @@ 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(); @@ -67,3 +74,3 @@ public: 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); |