diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-19 07:24:09 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-19 07:24:09 (GMT) |
| commit | 52e14a2d02d1d664bd8b981d261db0a62592efb8 (patch) | |
| tree | d315c6f53081a41bee4ccba540204eaeef66bb99 /qmake | |
| parent | 12bdeb146a479b008d9f65c022bb22a15989e558 (diff) | |
| parent | 5fb5c01bd0ac234eaca890d97053c7b0772861a3 (diff) | |
| download | Qt-52e14a2d02d1d664bd8b981d261db0a62592efb8.zip Qt-52e14a2d02d1d664bd8b981d261db0a62592efb8.tar.gz Qt-52e14a2d02d1d664bd8b981d261db0a62592efb8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 2b0ce28..7c4c70f 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -623,7 +623,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &t) } // Add all unknown libs to the deps - QStringList where("QMAKE_LIBS"); + QStringList where = QStringList() << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE"; if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS")) where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"]; for(QStringList::iterator wit = where.begin(); @@ -1556,6 +1556,7 @@ void VcprojGenerator::initOld() } project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS")); + project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE")); // Get filename w/o extension ----------------------------------- QString msvcproj_project = ""; @@ -1599,6 +1600,7 @@ void VcprojGenerator::initOld() // $$QMAKE.. -> $$MSVCPROJ.. ------------------------------------- project->values("MSVCPROJ_LIBS") += project->values("QMAKE_LIBS"); + project->values("MSVCPROJ_LIBS") += project->values("QMAKE_LIBS_PRIVATE"); project->values("MSVCPROJ_LFLAGS") += project->values("QMAKE_LFLAGS"); if(!project->values("QMAKE_LIBDIR").isEmpty()) { QStringList strl = project->values("QMAKE_LIBDIR"); |