diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2014-12-24 15:41:47 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2014-12-24 15:41:49 +0300 |
| commit | fc0ab935ce0942d4fd75805ca404884983099a3f (patch) | |
| tree | 656ac6e1825a1a2ea66f355c09117250933be21e | |
| parent | d2dbfedf191f6df7e6514274e93639d842c02552 (diff) | |
Do not use the qtaccessiblewidgets plugin on Qt 5.4 and greater.
For those versions, it is built into QtWidgets.
| -rw-r--r-- | qt.pri | 1 | ||||
| -rw-r--r-- | src/mumble/mumble.pro | 10 |
2 files changed, 10 insertions, 1 deletions
@@ -1,2 +1,3 @@ QT_VERSION = $$[QT_VERSION] QT_MAJOR_VERSION = $$section(QT_VERSION, ., 0, 0) +QT_MINOR_VERSION = $$section(QT_VERSION, ., 1, 1) diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro index d36f8ac84..905b57e73 100644 --- a/src/mumble/mumble.pro +++ b/src/mumble/mumble.pro @@ -567,7 +567,15 @@ CONFIG(no-update) { CONFIG(static_qt_plugins) { DEFINES += USE_STATIC_QT_PLUGINS - QTPLUGIN += qtaccessiblewidgets qico qsvg qsvgicon + QTPLUGIN += qico qsvg qsvgicon + + # The accessiblewidgets plugin is not needed for Qt 5.4 and greater, + # where it is integrated into the QtWidgets library. + # See QTBUG-43007 for more information. + isEqual(QT_MAJOR_VERSION, 5):!greaterThan(QT_MINOR_VERSION, 3) { + QTPLUGIN += qtaccessiblewidgets + } + macx { isEqual(QT_MAJOR_VERSION, 5) { QTPLUGIN += qicns qcocoa |