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>
This commit is contained in:
parent
12d9436522
commit
a84c87f1ad
@ -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=
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user