diff options
| author | axis <qt-info@nokia.com> | 2009-06-30 14:20:08 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-30 14:20:08 +0200 |
| commit | c84ac698d29cb2317af5f478b02da6bfb5673716 (patch) | |
| tree | 336a75344546f18b06a29d1b85bda04eed2e9e09 /qmake | |
| parent | b69bf0e7c936de19ae31e55bee3c85ec3b2b2c59 (diff) | |
| parent | 648400cb53d16125a7b1dc851cf01f09034f1fc7 (diff) | |
| download | qt4-tools-c84ac698d29cb2317af5f478b02da6bfb5673716.tar.gz | |
Merge branch 'warningRemovals'
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index f1e916534b..4459a4caac 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -687,7 +687,9 @@ bool SymbianMakefileGenerator::writeMmpFile(QString &filename, QStringList &symb } t << endl; - writeMmpFileLibraryPart(t); + if (!project->values("CONFIG").contains("static") && !project->values("CONFIG").contains("staticlib")) { + writeMmpFileLibraryPart(t); + } writeMmpFileCapabilityPart(t); |