diff options
| author | Iain <qt-info@nokia.com> | 2010-01-25 10:23:31 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2010-01-26 16:49:42 (GMT) |
| commit | f98901601fee4947fd0248f113b3a39a142292d5 (patch) | |
| tree | 67562c513a021ab2963b70db1ece6077376e9510 /tools | |
| parent | 1b54b600107e33cfbebaea3b2bd3c7f24385a1a8 (diff) | |
| download | Qt-f98901601fee4947fd0248f113b3a39a142292d5.zip Qt-f98901601fee4947fd0248f113b3a39a142292d5.tar.gz Qt-f98901601fee4947fd0248f113b3a39a142292d5.tar.bz2 | |
Updates to new Symbian DEF file system
Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to
see if DEF files were enabled, when setting the DEF file path
Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was
defined when testing for its value, due to incorrect use of
QMap::operator[]
Tidy up configure.exe help for new def files option
Task-number: QTBUG-6556
Reviewed-by: Jason Barron
Reviewed-by: Janne Koskinen
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 3f105b5..7751143 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1829,9 +1829,9 @@ bool Configure::displayHelp() desc("FREETYPE", "yes", "-qt-freetype", "Use the libfreetype bundled with Qt."); desc( "-fpu <flags>", "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2"); desc("S60", "no", "-no-s60", "Do not compile in S60 support."); - desc("S60", "yes", "-s60", "Compile with support for the S60 UI Framework\n"); - desc("SYMBIAN_DEFFILES", "no", "no-usedeffiles", "Disable the usage of DEF files."); - desc("SYMBIAN_DEFFILES", "yes", "usedeffiles", "Enable the usage of DEF files.\n"); + desc("S60", "yes", "-s60", "Compile with support for the S60 UI Framework"); + desc("SYMBIAN_DEFFILES", "no", "-no-usedeffiles", "Disable the usage of DEF files."); + desc("SYMBIAN_DEFFILES", "yes", "-usedeffiles", "Enable the usage of DEF files.\n"); return true; } return false; @@ -2753,10 +2753,12 @@ void Configure::generateCachefile() if ( dictionary["PLUGIN_MANIFESTS"] == "no" ) configStream << " no_plugin_manifest"; - if ( dictionary["SYMBIAN_DEFFILES"] == "yes" ) { - configStream << " def_files"; - } else if ( dictionary["SYMBIAN_DEFFILES"] == "no" ) { - configStream << " def_files_disabled"; + if ( dictionary.contains("SYMBIAN_DEFFILES") ) { + if(dictionary["SYMBIAN_DEFFILES"] == "yes" ) { + configStream << " def_files"; + } else if ( dictionary["SYMBIAN_DEFFILES"] == "no" ) { + configStream << " def_files_disabled"; + } } configStream << endl; configStream << "QT_ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; |