From a84c87f1adea0981d6dce9cd82761ef21b2fa4d2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 11 Jul 2011 16:55:53 +0200 Subject: [PATCH] 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 Reviewed-by: Marius Storm-Olsen --- mkspecs/features/qt.prf | 2 +- qmake/project.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 3791c9565a4..65deed3fec8 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..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 99aa0d3ae25..f6a45204f8a 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -2285,7 +2285,7 @@ QMakeProject::doProjectExpand(QString func, QList 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); }