diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-12 20:33:25 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-18 22:35:10 +0200 |
| commit | 80749d946b989c512c085d62a7acb793f6d480c8 (patch) | |
| tree | 5258bbccabedc9ef725a7efd28d080080648c84e | |
| parent | a89bd2d2fbde9fb9b93eb09ee6f068ec2b5a74bf (diff) | |
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>
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index d51c774821..146a1126bc 100644 --- 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")) |