use iris public header
Merge pull request #155 from drizt/public_header

use iris public header
Don't use the throbber icon if stream management is inactive
Merge pull request #157 from FlorianFieber/icons

Don't use the throbber icon if stream management is inactive
Enforce plaintext for status message in StatusSetDlg
Enforce plaintext in status message presets
Use ChatEdit in status dialog

This way, spellchecking will be used if enabled.
Update iris
Merge pull request #158 from FlorianFieber/fix-plain-status

Enforce plaintext for status message
Enforce plaintext for auto-away status message

Don't let Qt guess if the auto-away status message contains HTML.
Merge pull request #159 from FlorianFieber/fix-plain-status

Enforce plaintext for auto-away status message
Fix copy&pasting rich text into status message options
Switch status message options from QTextEdit to ChatEdit

Thus enabling spell-checking
Merge pull request #160 from FlorianFieber/fix-plain-status

Fix copy&pasting rich text into status message options
Fix adding ambigous shortcuts from submenus

A context menu action can contain a menu containing further actions, whose
shortcuts haven't been checked for ambiguity before.

This fixes shortcuts like <Del> for removing single contacts.
Merge pull request #161 from FlorianFieber/usability

Fix adding ambigous shortcuts from submenus
qt5 fix

Use .qmake.conf on Qt5 instead of .qmake.cache.in.
http://qt-project.org/wiki/QMake-top-level-srcdir-and-builddir