Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
Q
qtbase
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Labels
  • Merge Requests 6
    • Merge Requests 6
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • mer-core
  • qtbase
  • Merge Requests
  • !68

Closed
Opened Nov 26, 2020 by skozyakov@skozyakov1
  • Report abuse
Report abuse

[qtbase] Backport proper EGLFS_KMS initialization. Fixes JB#52239

  • Overview 2
  • Commits 1
  • Changes 7

Backports some fixes for EGLFS from Qt 5.7, namely fix for QTBUG-60330 and commit 091a386, enabling correct initialization for the Mali 628 proprietary drivers (and potentially others) with the following error:

[F] unknown:0 - Could not open egl display.

This only affects hybris-less devices. It doesn't change behavior on other hybris-less devices that doesn't suffer from that problem (i.e. PinePhone).

Edited Nov 26, 2020 by skozyakov

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://git.sailfishos.org/skozyakov/qtbase.git" "jb52239"
git checkout -b "skozyakov/qtbase-jb52239" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/mer-5.6"
git merge --no-ff "skozyakov/qtbase-jb52239"

Step 4. Push the result of the merge to GitLab

git push origin "mer-5.6"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: mer-core/qtbase!68