summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-06-30 11:57:33 (GMT)
committeraxis <qt-info@nokia.com>2009-06-30 12:13:36 (GMT)
commit5abb37a995dbc5c68e74c2ca850ca191bcf62622 (patch)
treeb624d782eb63b4b0462fd7e137950aff4db5ebc6 /qmake
parent78166d5235a5045fdc887febe01d789cac333bb3 (diff)
downloadQt-5abb37a995dbc5c68e74c2ca850ca191bcf62622.zip
Qt-5abb37a995dbc5c68e74c2ca850ca191bcf62622.tar.gz
Qt-5abb37a995dbc5c68e74c2ca850ca191bcf62622.tar.bz2
Removed warnings on Symbian.
Library entries produce warnings if they are included in a project which has a static library target. RevBy: Miikka Heikkinen
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/symbian/symmake.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index f1e9165..4459a4c 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);