From a84c87f1adea0981d6dce9cd82761ef21b2fa4d2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 11 Jul 2011 16:55:53 +0200 Subject: 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') 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..depends variable -QT = $$resolve_depends($$QT, "QT.") +QT = $$resolve_depends(QT, "QT.") QT_DEPENDS= -- cgit v1.2.3 From 1aa9affcf1cd177b91e0a92a18e937f8ae892af2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 11 Jul 2011 17:17:18 +0200 Subject: fix misnomer: $$resolve_depends() => $$sort_depends() ... and re-add a real $$resolve_depends(), just in case. Change-Id: I489d6056546340ce95280fe7fd571e30c14470e7 Reviewed-on: http://codereview.qt.nokia.com/1455 Reviewed-by: Qt Sanity Bot Reviewed-by: Marius Storm-Olsen --- mkspecs/features/qt.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 65deed3fec..2bc184516f 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 = $$sort_depends(QT, "QT.") QT_DEPENDS= -- cgit v1.2.3