Differential D12184

Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
ClosedPublic
Actions

Authored by asturmlechner on Apr 13 2018, 10:03 PM.

Details

Reviewers
mardelle
Group Reviewers
Kdenlive
Commits
R158:c595018a4201: Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
Summary

A change in Qt 5.11_beta3 leads to errors like:

CMake Error at renderer/CMakeLists.txt:12 (qt5_use_modules):

`Unknown CMake command "qt5_use_modules".`
Test Plan

Built fine.

Diff Detail

Repository
R158 Kdenlive
Branch
Applications/18.04
Lint
No Linters Available
Unit
No Unit Test Coverage
asturmlechner requested review of this revision.Apr 13 2018, 10:03 PM
asturmlechner created this revision.
mardelle added a comment.Apr 17 2018, 9:09 PM

Hi! Thanks a lot for your patch. In fact, on my side a few more changes were required to successfully make it compile. Attached is my diff. Ok for you ?

fixqt.diff1 KBDownload

asturmlechner added a comment.Apr 17 2018, 10:09 PM
In D12184#248477, @mardelle wrote:

Hi! Thanks a lot for your patch. In fact, on my side a few more changes were required to successfully make it compile. Attached is my diff. Ok for you ?

Interestingly the missing components in find_package(Qt5...) do not make my build fail so they may be provided implicitly. I see that Qt5::Concurrent is in use though so it should definitely added. I don't see the QuickWidgets usage though?

mardelle added a comment.Apr 18 2018, 9:37 AM

Well it failed for me on Qt 5.9. But correct, QuickWidgets is an error (required for the refactoring branch but not 18.04).

fixcompile.diff1 KBDownload

asturmlechner updated this revision to Diff 32479.Apr 18 2018, 3:30 PM

Update with mardelle's changes, drop obsolete QT*_LIBRARIES

asturmlechner added a comment.Apr 18 2018, 3:46 PM

I can push this to 18.04 branch and merge back to master. I guess it makes more sense for you to pick/merge this to refactor branch with the required changes.

mardelle accepted this revision.Apr 20 2018, 6:08 AM

Perfect, thanks. I will take care of the refactoring branch.

This revision is now accepted and ready to land.Apr 20 2018, 6:08 AM
asturmlechner closed this revision.Apr 20 2018, 7:46 AM

Revision Contents
Changeset List

PathPackages
MCMakeLists.txt (2 lines)
Mrenderer/CMakeLists.txt (8 lines)
Msrc/CMakeLists.txt (2 lines)

Diff 32479

View Options

CMakeLists.txt

Loading...
View Options

renderer/CMakeLists.txt

Loading...
View Options

src/CMakeLists.txt

Loading...