diff -r 5dc02b23752f -r 3e2da88830cd qmake/project.h --- a/qmake/project.h Tue Jul 06 15:10:48 2010 +0300 +++ b/qmake/project.h Wed Aug 18 10:37:55 2010 +0300 @@ -80,6 +80,7 @@ bool recursive; bool own_prop; + bool backslashWarned; QString pfile, cfile; QMakeProperty *prop; void reset(); @@ -117,7 +118,7 @@ ~QMakeProject(); enum { ReadCache=0x01, ReadConf=0x02, ReadCmdLine=0x04, ReadProFile=0x08, - ReadPostFiles=0x10, ReadFeatures=0x20, ReadConfigs=0x40, ReadAll=0xFF }; + ReadFeatures=0x20, ReadConfigs=0x40, ReadAll=0xFF }; inline bool parse(const QString &text) { return parse(text, vars); } bool read(const QString &project, uchar cmd=ReadAll); bool read(uchar cmd=ReadAll); @@ -126,7 +127,6 @@ QStringList userTestFunctions() { return testFunctions.keys(); } QString projectFile(); - QString configFile(); inline QMakeProperty *properties() { return prop; } bool doProjectTest(QString str, QMap &place); @@ -173,9 +173,6 @@ return pfile; } -inline QString QMakeProject::configFile() -{ return cfile; } - inline QStringList &QMakeProject::values(const QString &v) { return values(v, vars); }