diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-06 10:00:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-06 10:00:44 (GMT) |
| commit | d94a8aba64a9b3d3e2ecff943d3c717d68074e36 (patch) | |
| tree | 9cbcde1cdab5b24bd33c5581dff5463abea28299 /qmake | |
| parent | 718013958724210915b24142c499154f751f0bac (diff) | |
| parent | a780cf591ed2d311489576152be7c4b453ad5963 (diff) | |
| download | Qt-d94a8aba64a9b3d3e2ecff943d3c717d68074e36.zip Qt-d94a8aba64a9b3d3e2ecff943d3c717d68074e36.tar.gz Qt-d94a8aba64a9b3d3e2ecff943d3c717d68074e36.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix random miscompilation with msvc
don't ignore create_prl for static plugins
make QLibraryInfo return clean paths
make relative paths in qt.conf work inside qmake
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 3c5948f..b9089fc 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1109,7 +1109,7 @@ MakefileGenerator::writePrlFile() && project->isActiveConfig("create_prl") && (project->first("TEMPLATE") == "lib" || project->first("TEMPLATE") == "vclib") - && !project->isActiveConfig("plugin")) { //write prl file + && (!project->isActiveConfig("plugin") || project->isActiveConfig("static"))) { //write prl file QString local_prl = prlFileName(); QString prl = fileFixify(local_prl); mkdir(fileInfo(local_prl).path()); |