From 7d4980f3ee360baf0793f986daeef49f2be1edd9 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 17 Jun 2013 12:18:36 +0200
Subject: [PATCH] make use of QT_MODULES to simplify code

Change-Id: I1124088f807023faf678e030cfb1fc4a4c8b40d7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 mkspecs/features/qt_functions.prf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index d1e0e39cff..f8021a2f5a 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -26,9 +26,8 @@ defineTest(qtAddLibrary) {
     warning("qtAddLibrary() is deprecated. Use qtAddModule() or QT+= instead.")
 
     # Reverse-engineer the module name from the library name.
-    for(var, $$list($$find($$list($$enumerate_vars()), ^QT\\.[^.]+\\.name$))) {
-        isEqual($$var, $$1) {
-            var ~= s,^QT\\.([^.]+)\\.name$,\\1,
+    for(var, QT_MODULES) {
+        isEqual(QT.$${var}.name, $$1) {
             qtAddModule($$var, , LIBS):return(true):break()
             return(false):break() # Yes, the break is insanity. But necessary.
         }