diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-10 11:47:28 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-10 11:47:28 (GMT) |
| commit | 0df5d5e4367a8052082897d02b4f00429d5cc4c1 (patch) | |
| tree | cc8a59f0e37dbd618270bbca5b644fc3b775d60a /qmake | |
| parent | f61ec84fc296c6f70011e30788ee511d6b6a18c6 (diff) | |
| parent | 17bffacda99055831bb4c8c6e7da39ec15415519 (diff) | |
| download | Qt-0df5d5e4367a8052082897d02b4f00429d5cc4c1.zip Qt-0df5d5e4367a8052082897d02b4f00429d5cc4c1.tar.gz Qt-0df5d5e4367a8052082897d02b4f00429d5cc4c1.tar.bz2 | |
Merge commit 'qt/master'
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/project.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 6bb8b2c..2e0b1e7 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -2836,10 +2836,15 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QMap<QSt case T_LOAD: { QString parseInto; const bool include_statement = (func_t == T_INCLUDE); - bool ignore_error = include_statement; - if(args.count() == 2) { + bool ignore_error = false; + if(args.count() >= 2) { if(func_t == T_INCLUDE) { parseInto = args[1]; + if (args.count() == 3){ + QString sarg = args[2]; + if (sarg.toLower() == "true" || sarg.toInt()) + ignore_error = true; + } } else { QString sarg = args[1]; ignore_error = (sarg.toLower() == "true" || sarg.toInt()); @@ -2881,8 +2886,8 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QMap<QSt if(stat == IncludeFeatureAlreadyLoaded) { warn_msg(WarnParser, "%s:%d: Duplicate of loaded feature %s", parser.file.toLatin1().constData(), parser.line_no, file.toLatin1().constData()); - } else if(stat == IncludeNoExist && include_statement) { - warn_msg(WarnParser, "%s:%d: Unable to find file for inclusion %s", + } else if(stat == IncludeNoExist && !ignore_error) { + warn_msg(WarnAll, "%s:%d: Unable to find file for inclusion %s", parser.file.toLatin1().constData(), parser.line_no, file.toLatin1().constData()); return false; } else if(stat >= IncludeFailure) { |