diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-06 16:09:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-06 16:09:58 (GMT) |
| commit | 4ec3288621aabc17ba8637611d39128566072047 (patch) | |
| tree | 720d6c81b6f3a9e6d1d699701d170db0a334cace /qmake/generators | |
| parent | 4b35a36ca088a79c1aac877d3259e8a981399ee9 (diff) | |
| parent | d94a8aba64a9b3d3e2ecff943d3c717d68074e36 (diff) | |
| download | Qt-4ec3288621aabc17ba8637611d39128566072047.zip Qt-4ec3288621aabc17ba8637611d39128566072047.tar.gz Qt-4ec3288621aabc17ba8637611d39128566072047.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'qmake/generators')
| -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 4f3b113..5960d26 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()); |