diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-02-02 16:35:48 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-02-02 16:35:48 (GMT) |
| commit | 4417eb93c422e0c24d54e34e0a58febd851e3085 (patch) | |
| tree | 54fb249fc87b77104b26a6640bb1d9423536f1f4 /tools/configure | |
| parent | a6d15a5d2035ef1b7bfda0647f56a16dc6666873 (diff) | |
| download | Qt-4417eb93c422e0c24d54e34e0a58febd851e3085.zip Qt-4417eb93c422e0c24d54e34e0a58febd851e3085.tar.gz Qt-4417eb93c422e0c24d54e34e0a58febd851e3085.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
(cherry picked from commit f98901601fee4947fd0248f113b3a39a142292d5)
Conflicts:
configure.exe
Diffstat (limited to 'tools/configure')
| -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 45da648..36a2b7a 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; @@ -2756,10 +2756,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; |