summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorRolland Dudemaine <rolland@ghs.com>2011-11-15 17:28:18 +0100
committerHarald Fernengel <harald.fernengel@nokia.com>2011-11-15 17:28:18 +0100
commitfe02f62524515b80edd9b18609fe7e5b1fb7eb2b (patch)
tree71a5ac695fe48a60f948fbaac597070d5bc0ed05 /qmake
parentddca33b935b411442a17614f622fdd18846e3a7a (diff)
Use "dll" instead of "shared".
For DLLs (which are not supported, but may be soon), use the CONFIG variable "dll" instead of the "shared" template, because some testcases actually use shared even when compiled statically. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/integrity/gbuild.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp
index f6499eb455..081b441ed1 100644
--- a/qmake/generators/integrity/gbuild.cpp
+++ b/qmake/generators/integrity/gbuild.cpp
@@ -153,7 +153,7 @@ GBuildMakefileGenerator::writeMakefile(QTextStream &text)
Option::output.setFileName(filename);
MakefileGenerator::openOutput(Option::output, QString());
} else if ((project->first("TEMPLATE") == "lib")
- && project->isActiveConfig("shared")) {
+ && project->isActiveConfig("dll")) {
QString gpjname(strtarget);
gpjname += "_shared";
gpjname += projectSuffix();