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

OptionSelectorDelegate: avoid error when modelData is undefined and option.text==="" #106

Closed matdahl closed 3 years ago

matdahl commented 3 years ago

see issue #105

dobey commented 3 years ago

Also can you please do a git pull --rebase origin xenial and then git push --force in this branch? It seems the build is failing due to being out of sync with the changes that landed for supporting Qt 5.12, and CI doesn't do a three way merge when building.

matdahl commented 3 years ago

Also can you please do a git pull --rebase origin xenial and then git push --force in this branch? It seems the build is failing due to being out of sync with the changes that landed for supporting Qt 5.12, and CI doesn't do a three way merge when building.

I did it. But it seems like nothing happend ...

dobey commented 3 years ago

I did it. But it seems like nothing happend ...

Ah, sorry. I guess your origin is not the upstream, but your forked repo. You'll need to do git remote add upstream https://github.com/ubports/ubuntu-ui-toolkit.git and then do git pull --rebase upstream xenial to pull in the commits for Qt 5.12 support. Then push that to your repo. Thanks.

matdahl commented 3 years ago

I did it. But it seems like nothing happend ...

Ah, sorry. I guess your origin is not the upstream, but your forked repo. You'll need to do git remote add upstream https://github.com/ubports/ubuntu-ui-toolkit.git and then do git pull --rebase upstream xenial to pull in the commits for Qt 5.12 support. Then push that to your repo. Thanks.

Thanks! Now it worked

dobey commented 3 years ago

OK. Per my previous comment in the thread above, I'm going to close this for now. We can revisit after the migration to GitLab. Thanks!