diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-24 18:55:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-24 18:55:24 (GMT) |
| commit | 422282c4f3e439990abc6c6b79699d943b9541d7 (patch) | |
| tree | 6f817901347e87677fdd6af4c3888707dfa3216e | |
| parent | bdeb4b458320ddefc9bcd19620bed7dc242b4d5c (diff) | |
| parent | a17a8bfe860b6a055f60068ef04f9e31278cd6c4 (diff) | |
| download | Qt-422282c4f3e439990abc6c6b79699d943b9541d7.zip Qt-422282c4f3e439990abc6c6b79699d943b9541d7.tar.gz Qt-422282c4f3e439990abc6c6b79699d943b9541d7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Enable the no-undefined flag on the linker for icc
| -rw-r--r-- | src/qbase.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index 4217618..8460b9c 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -36,7 +36,7 @@ CONFIG += qt warn_on depend_includepath CONFIG += qmake_cache target_qt CONFIG -= fix_output_dirs win32|mac:!macx-xcode:CONFIG += debug_and_release -linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF +linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions |