diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:07:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:07:55 -0600 |
| commit | 3ad1b623ac4af0f19db3580e4ef6b0d923260ba0 (patch) | |
| tree | 3b77748c913634d88310c7933877b201532d4ae1 /qmake/project.cpp | |
| parent | e02e31c8b9d854cd62cbe9799228f6e08e882773 (diff) | |
| download | tqt3-3ad1b623ac4af0f19db3580e4ef6b0d923260ba0.tar.gz tqt3-3ad1b623ac4af0f19db3580e4ef6b0d923260ba0.zip | |
Sync again
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 9b62d4cde..5b883b3c4 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -448,7 +448,7 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place) varlist.remove((*valit)); } } - if(var == "RETQUIRES") /* special case to get communicated to backends! */ + if(var == "REQUIRES") /* special case to get communicated to backends! */ doProjectCheckReqs(vallist, place); return TRUE; @@ -1050,7 +1050,7 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap<TQString, TQSt int rparen = chk.findRev(')'); if(rparen == -1) { TQCString error; - error.sprintf("Function (in RETQUIRES) missing right paren: %s", chk.latin1()); + error.sprintf("Function (in REQUIRES) missing right paren: %s", chk.latin1()); qmake_error_msg(error); } else { TQString func = chk.left(lparen); @@ -1064,9 +1064,9 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap<TQString, TQSt test = !test; } if(!test) { - debug_msg(1, "Project Parser: %s:%d Failed test: RETQUIRES = %s", + debug_msg(1, "Project Parser: %s:%d Failed test: REQUIRES = %s", parser.file.latin1(), parser.line_no, chk.latin1()); - place["QMAKE_FAILED_RETQUIREMENTS"].append(chk); + place["QMAKE_FAILED_REQUIREMENTS"].append(chk); ret = FALSE; } } |