diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 20:20:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 20:20:10 (GMT) |
| commit | b317eb32c495cbedf5553de333ffdafbf3d75fc4 (patch) | |
| tree | f9d98492f03729d5a59829c1c6658fc62cef1650 /src/plugins | |
| parent | a1a24e65985988984c385677116247559833e5d9 (diff) | |
| parent | e91bd2881ffa0c15bcf90b7e08c3a530a52e9301 (diff) | |
| download | Qt-b317eb32c495cbedf5553de333ffdafbf3d75fc4.zip Qt-b317eb32c495cbedf5553de333ffdafbf3d75fc4.tar.gz Qt-b317eb32c495cbedf5553de333ffdafbf3d75fc4.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Adds support for sun-libiconv to plugins.pro
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/plugins.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 722979d..bc3deb7 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS *= sqldrivers script bearer unix:!symbian { - contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs + contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv)|contains(QT_CONFIG,sun-libiconv):SUBDIRS *= codecs } else { SUBDIRS *= codecs } |