Differential D12276

define a compat qt5_use_modules macro when building for qt5
ClosedPublic
Actions

Authored by sitter on Apr 17 2018, 10:49 AM.

Details

Reviewers
asturmlechner
Commits
R487:9673e65548ec: define a compat qt5_use_modules macro when building for qt5
Summary

Qt 5.11 dropped the macro, we still rely on it as a single point for
managing qt dependencies. we now define a dummy wrapper for it even when
building qt5 if the macro doesn't already exist

Test Plan

Needs testing with 5.11 beta. Assuming, I remember things correctly this
should fix libphonon, as well as all backends (so long as they are built
against this libphonon)

Diff Detail

Repository
R487 Phonon
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
sitter requested review of this revision.Apr 17 2018, 10:49 AM
sitter created this revision.
asturmlechner added a comment.Apr 17 2018, 12:00 PM

I've tested this patch against phonon-4.9.1 (which is our last version with Qt4-support) and it built fine with Qt4 and Qt5.

sitter added a comment.Apr 17 2018, 12:06 PM

@asturmlechner backends building as well with this?

asturmlechner added a comment.Apr 17 2018, 12:14 PM

Yes, both -vlc and -gstreamer built fine as well.

sitter added a comment.Apr 17 2018, 12:15 PM

Yay! thanks.

This revision was not accepted when it landed; it landed in state Needs Review.Apr 17 2018, 12:16 PM
Closed by commit R487:9673e65548ec: define a compat qt5_use_modules macro when building for qt5 (authored by sitter). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcmake/PhononQt5.cmake (11 lines)

Diff 32382

View Options

cmake/PhononQt5.cmake

Loading...