summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-02-24 20:00:08 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-09 22:37:18 +0100
commitf744b82344ffd4f5719dcab57c4074179448e170 (patch)
treebabc856f1f307759e64052cf6a6f991e858501f5 /mkspecs/features
parent849b760c9047a9306d5a63d7fa60d0ab2431e1dd (diff)
fix the check for libraries having themselves as dependencies
Change-Id: I6dc56228a068fe9158e989afd1c545a3d69848e6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/qt.prf5
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index f5ee74cf86..f71afbb04e 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -168,12 +168,13 @@ for(QTLIB, QT) {
QT = $$resolve_depends(NEWQT, "QT.")
# Finally actually add the modules
for(QTLIB, QT) {
- isEmpty(QT.$${QTLIB}.name) {
+ QTLIBNAME = $$eval(QT.$${QTLIB}.name)
+ isEmpty(QTLIBNAME) {
message("Warning: unknown QT module: $$QTLIB")
next()
}
- target_qt:isEqual(TARGET, QTLIB) {
+ target_qt:isEqual(TARGET, $$QTLIBNAME) {
warning($$TARGET cannot have a QT of $$QTLIB)
next()
}