diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 14:56:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 14:56:04 (GMT) |
| commit | 46c36d6a939b6d808348106164663b8f732c090b (patch) | |
| tree | eb4072afb9a74fb07e3d01cc7f2ee6204828d41c /LGPL_EXCEPTION.txt | |
| parent | 392ecc76cdbcef37ee492400a1b783106a37ad36 (diff) | |
| parent | 4b73e816189d924bd499fc8b7fb29365539d5e38 (diff) | |
| download | Qt-46c36d6a939b6d808348106164663b8f732c090b.zip Qt-46c36d6a939b6d808348106164663b8f732c090b.tar.gz Qt-46c36d6a939b6d808348106164663b8f732c090b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Extended the convenience functions for QInputDialog for IM hints.
Added support for using inputMethodHints in QInputDialog edit widget.
Fixed some preprocessor parameters for Mac support.
Fixed missing QMAKE_MOC definition in certain mkspecs.
Align .pro with qmake: s/\.sources/.files/.
Inconsistency with deployment keyword .sources and .files.
Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions