(cherry picked from commit 3f5c8318)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit ba501462)
Signed-off-by: Geoffroy Couprie <geal@videolan.org>

Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>

The code (with or without this patch) looks quite fishy though.
Fortunately, I do not understand Objective-C, so I can blindly assume
it is correct.
(cherry picked from commit 23a91c0e)

This gets rid of the blocking queued connection for non-modal errors,
which was causing deadlocks in the audio output

Pointed-out-by: Laurent Aimar
(cherry picked from commit c545ce84)

Conflicts:

	modules/gui/qt4/dialogs/external.cpp
	modules/gui/qt4/dialogs/external.hpp

(cherry picked from commit afacc88a)

(cherry picked from commit 9a55c487)

(cherry picked from commit a333ed73)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit f20675ea)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit a829c558)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit c0233eca)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 4c74cf33)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
(cherry picked from commit 2372b5be)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

In HandleMessage(), don't let the 0xF0 case fallthrough. Otherwise setting datalen would be pointless.
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
(cherry picked from commit 7dd7ba08)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
(cherry picked from commit 857fbdbc)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

This is probably not enough to fix all the fontconfig issues.

(cherry picked from commit dcbb433f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

This reverts commit f4e4ec78.
Non-modal errors are non-model errors, and we only use the error dialog
for non-modal errors (otherwise we use a critical message box). We need
the Qt4 UI to remain usable inspite of a continuous flow of error.
(cherry picked from commit 36b4ced9)

(cherry picked from commit 61918560)

(cherry picked from commit 40486dcf)

(cherry picked from commit d8e0025e)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

This commit create conditional lines in the Windows
installer script to not try to install some features if
they have not been compiled.
(cherry picked from commit 599883e0)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 3617f5b4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close #2900
(cherry picked from commit e957d5d4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Fix description inversion as Nicolas Rault described on @vlc.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 1ba9b1f2)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit a63ddf96)

(cherry picked from commit 22507d75 and
e83b4259)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit e348132d)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 77190676 and
b50e987e)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>