diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 18:30:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 18:30:49 (GMT) |
| commit | 1794dcc6a6353e4c3c5e0ecfee6ea646a401bd1e (patch) | |
| tree | 998fe2f427bebe5d7cad02f51bf0ef02c8131e0e | |
| parent | 537177299d2c0fa55eb552cbb0275f289bee2661 (diff) | |
| parent | 20a154ffc3afacdbc22d00a3c4dd0a2916a14e33 (diff) | |
| download | Qt-1794dcc6a6353e4c3c5e0ecfee6ea646a401bd1e.zip Qt-1794dcc6a6353e4c3c5e0ecfee6ea646a401bd1e.tar.gz Qt-1794dcc6a6353e4c3c5e0ecfee6ea646a401bd1e.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian-linux crosscompilation configuration align
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -7443,9 +7443,10 @@ if [ "$CFG_EXCEPTIONS" != "no" ]; then QTCONFIG_CONFIG="$QTCONFIG_CONFIG exceptions" fi -if [ "$XPLATFORM_MINGW" = "yes" ]; then +if [ "$XPLATFORM_MINGW" = "yes" ] || [ "$XPLATFORM_SYMBIAN" = "yes" ]; then # mkspecs/features/win32/default_pre.prf sets "no-rtti". - # Follow default behavior of configure.exe by overriding with "rtti". + # Follow default behavior of configure.exe by overriding with "rtti" + # (also on Symbian). QTCONFIG_CONFIG="$QTCONFIG_CONFIG rtti" fi |