1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make 1st argument of $$resolve_depends a variable

Browse Source 
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:
Oswald Buddenhagen 2011-07-11 16:55:53 +02:00 committed by Qt by Nokia
parent 12d9436522
commit a84c87f1ad
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt.prf
View File

@ -130,7 +130,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
# Topological ordering of modules based on their QT.<module>.depends variable # Topological ordering of modules based on their QT.<module>.depends variable
QT = $$resolve_depends($$QT, "QT.") QT = $$resolve_depends(QT, "QT.")
QT_DEPENDS= QT_DEPENDS=

2
qmake/project.cpp
View File

@ -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", fprintf(stderr, "%s:%d: resolve_depends(var, prefix) requires one or two arguments.\n",
parser.file.toLatin1().constData(), parser.line_no); parser.file.toLatin1().constData(), parser.line_no);
} else { } else {
ret += resolveDepends(args[0].split(QString(Option::field_sep)), ret += resolveDepends(values(args[0], place),
(args.count() != 2 ? QString() : args[1]), (args.count() != 2 ? QString() : args[1]),
place); place);
} }