diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-07-01 12:40:40 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-07-01 12:40:40 (GMT) |
| commit | 5e4b53a50db19fe5d51f0a5fe035a29ff331a725 (patch) | |
| tree | 4f8f0baa23be7c0e6c4549f6824b6cdfe14aa503 /qmake/generators | |
| parent | 42e63a7e65d4dbfb2a79133eb63a561f50760344 (diff) | |
| parent | 27c4a4d9c91e6c16d1d43d2d99c0176a58650e15 (diff) | |
| download | Qt-5e4b53a50db19fe5d51f0a5fe035a29ff331a725.zip Qt-5e4b53a50db19fe5d51f0a5fe035a29ff331a725.tar.gz Qt-5e4b53a50db19fe5d51f0a5fe035a29ff331a725.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'qmake/generators')
| -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 5ad50bb..374d058 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -694,7 +694,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); |