summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-04-20 17:47:49 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-05-06 09:35:23 (GMT)
commit2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1 (patch)
tree4071ba3a2fc6b3526a5db1ecb0eedf7b19bd3bc6
parent9cd62e4f7b23894a672297f6eebda64cdbd53cb0 (diff)
downloadQt-2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1.zip
Qt-2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1.tar.gz
Qt-2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1.tar.bz2
don't ignore create_prl for static plugins
Task-number: QTBUG-18436 Reviewed-by: joerg
-rw-r--r--qmake/generators/makefile.cpp2
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());