diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-11 16:55:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-11 18:58:41 +0200 |
| commit | a84c87f1adea0981d6dce9cd82761ef21b2fa4d2 (patch) | |
| tree | ce114ee83b59ea57fe311029daf7d51f94f0ffcc | |
| parent | 12d9436522c13f5317617670e20991ef647f211a (diff) | |
make 1st argument of $$resolve_depends a variable
this is braindead, but it's consistent with the rest of qmake and more
performant. and the argument error message claimed it already anyway.
Change-Id: I973368acc6ffbff17107085ccd68b0334cc3e681
Reviewed-on: http://codereview.qt.nokia.com/1436
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| -rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
| -rw-r--r-- | qmake/project.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 3791c9565a..65deed3fec 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -130,7 +130,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT # Topological ordering of modules based on their QT.<module>.depends variable -QT = $$resolve_depends($$QT, "QT.") +QT = $$resolve_depends(QT, "QT.") QT_DEPENDS= diff --git a/qmake/project.cpp b/qmake/project.cpp index 99aa0d3ae2..f6a45204f8 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -2285,7 +2285,7 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, fprintf(stderr, "%s:%d: resolve_depends(var, prefix) requires one or two arguments.\n", parser.file.toLatin1().constData(), parser.line_no); } else { - ret += resolveDepends(args[0].split(QString(Option::field_sep)), + ret += resolveDepends(values(args[0], place), (args.count() != 2 ? QString() : args[1]), place); } |