use QT_INSTALL_LIBS directly instead of messing with QMAKE_LIBDIR

this is what this code assumes anyway

Change-Id: I667412b101c18325321a568cc22d25ef07418ffb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index d51c774..146a112 100644 (file)
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1102,9 +1102,12 @@ void VcprojGenerator::initDeploymentTool()
 
     // Only deploy Qt libs for shared build
     if (!project->values("QMAKE_QT_DLL").isEmpty()) {
+        // FIXME: This code should actually resolve the libraries from all Qt modules.
+        const QString &qtdir = QLibraryInfo::rawLocation(QLibraryInfo::LibrariesPath,
+                                                         QLibraryInfo::EffectivePaths);
         const QStringList &arg = project->values("MSVCPROJ_LIBS");
         for (QStringList::ConstIterator it = arg.constBegin(); it != arg.constEnd(); ++it) {
-            if (it->contains(project->first("QMAKE_LIBDIR"))) {
+            if (it->contains(qtdir)) {
                 QString dllName = *it;
 
                 if (dllName.contains(QLatin1String("QAxContainer"))