search

ubports / ubuntu-ui-toolkit

Moved to https://gitlab.com/ubports/core/lomiri-ui-toolkit
https://gitlab.com/ubports/core/lomiri-ui-toolkit
GNU Lesser General Public License v3.0
13 stars 21 forks source link

Add support for newer qt version #61

Closed mariogrip closed 4 years ago

mariogrip commented 4 years ago

This pulls in fixes from @z3ntu where I made those compile on lesser version using #ifdef

Thanks @z3ntu for the fixes :)

mariogrip commented 4 years ago

@z3ntu if you have time, could you make sure this builds on newer versions too?

z3ntu commented 4 years ago

I can only test with Qt 5.14 at the time and additional fixes in #62 it compiles fine. Launching ./gallery.sh and clicking through the window seems to work fine (except the images not being found but that's probably because I don't have the Suru icons installed)

z3ntu commented 4 years ago

I wonder if we can somehow get CI for multiple Qt versions but I'm not aware of a distro packaging multiple Qt versions. I wonder if we can use flatpak for that though, flathub has runtimes with Qt 5.9, 5.11, 5.12 and 5.13

mariogrip commented 4 years ago

I wonder if we can somehow get CI for multiple Qt versions but I'm not aware of a distro packaging multiple Qt versions. I wonder if we can use flatpak for that though, flathub has runtimes with Qt 5.9, 5.11, 5.12 and 5.13

This is a good idea, but since we are moving to gitlab (soon ish) it might be easier to use docker (https://hub.docker.com/r/darkmattercoder/qt-build) for this

z3ntu commented 4 years ago

Haven't thought about Docker, seems like a good use case for this!

Anyways, #62 should be merged (that PR targets the branch of this PR), then I'm happy :)

mariogrip commented 4 years ago

Added some pretty ci here: https://gitlab.com/ubports/core/ubuntu-ui-toolkit/merge_requests/1

z3ntu commented 4 years ago

Also if we move these changes into xenial, can we remove the bionic branch? And maybe rename xenial to master? From my side a perfect ubports repo branch setup would be: