diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-04 13:37:18 +0100 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-04 13:37:18 +0100 |
| commit | 8f83747d12efc612b730a7dd911f916127387c0c (patch) | |
| tree | d61b4c877cd14247ae0de260034cb99494434c5d /qmake/generators/symbian/symmake_abld.cpp | |
| parent | 53038b678ccba374da5ce9ad216044f075a3ffd8 (diff) | |
| parent | 8e98033a67263f6a2d9155f228dc28e2faee4f5e (diff) | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
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 99547832e1..26dd3fda0a 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(""); |