diff options
author | axis <qt-info@nokia.com> | 2010-02-12 15:55:11 +0100 |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-02-12 15:55:11 +0100 |
commit | 0a3fef019630a7a49fdca28b3e507400bf4dec19 (patch) | |
tree | 50fbc7b6303787fa3ef9eac363aa6fe53397c5e7 /qmake/generators/symbian/symmake_abld.cpp | |
parent | 12b5471062a52f6745f4309568b4c27c5e12d91f (diff) | |
parent | 01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2 (diff) |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.cpp
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
Conflict resolution was heavily based on manual application of commit
9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
Diffstat (limited to 'qmake/generators/symbian/symmake_abld.cpp')
-rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 0b6f7497d7..572c742af7 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -172,7 +172,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool releasePlatforms.removeAll("winscw"); // No release for emulator QString testClause; - if (project->values("CONFIG").contains("symbian_test", Qt::CaseInsensitive)) + if (project->isActiveConfig("symbian_test")) testClause = QLatin1String(" test"); else testClause = QLatin1String(""); |