diff options
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index bbbb5d36a3..cd74c1d7cf 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -26,11 +26,10 @@ 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, - qtAddModule($$var, , LIBS):return(true):break() - return(false):break() # Yes, the break is insanity. But necessary. + for(var, QT_MODULES) { + isEqual(QT.$${var}.name, $$1) { + qtAddModule($$var, , LIBS) + return(true):break() # Yes, the break is insanity. But necessary. } } error("No module matching library '$$1' found.") @@ -131,7 +130,6 @@ defineTest(qtAddModule) { export(QMAKE_RPATHDIR) export(QMAKE_RPATHLINKDIR) export(PRE_TARGETDEPS) - return(true) } # qt variable, libs variable @@ -256,13 +254,15 @@ defineTest(qtAddTargetEnv) { } equals(QMAKE_HOST.os, Windows) { deppath.name = PATH - } else:contains(QMAKE_HOST.os, Linux|FreeBSD) { + } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) { deppath.name = LD_LIBRARY_PATH } else:equals(QMAKE_HOST.os, Darwin) { contains(QT_CONFIG, qt_framework): \ deppath.name = DYLD_FRAMEWORK_PATH else: \ deppath.name = DYLD_LIBRARY_PATH + } else:equals(QMAKE_HOST.os, AIX) { + deppath.name = LIBPATH } else { error("Operating system not supported.") } |