diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-10 08:33:34 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-10 08:33:34 (GMT) |
| commit | e5913012f44843bd8f7a6cc28de5de87f134aa65 (patch) | |
| tree | 9acb7897440aec8eec7e926cb160c59a8fed78d2 /qmake | |
| parent | 761b2fec23a17ea523cbd78beb2731526ea19891 (diff) | |
| parent | 7aa2d76dfc4a107f38c5cb0aac00a0b31d0fbbb6 (diff) | |
| download | Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.zip Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.tar.gz Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/api/qscriptable.cpp
src/script/api/qscriptable_p.h
src/script/qscriptclassdata.cpp
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 8 | ||||
| -rw-r--r-- | qmake/project.cpp | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 5f250bf..9759e7d 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1261,7 +1261,13 @@ void VcprojGenerator::initDeploymentTool() searchPath = info.absoluteFilePath(); } else { nameFilter = source.split('\\').last(); - searchPath = info.absolutePath(); + if (source.contains('*')) { + source = source.split('*').first(); + info = QFileInfo(source); + } + searchPath = info.absolutePath(); + if (!info.exists()) + fprintf(stderr, "Deployment file is missing %s\n", source.toLatin1().constData()); } int pathSize = searchPath.size(); diff --git a/qmake/project.cpp b/qmake/project.cpp index e44c6c7..adf83ea 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -2576,10 +2576,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()); @@ -2621,8 +2626,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) { |