Reviewing merge request #483: Fix build with Mesa 7.8's EGL implementation

Without this change, Qt barfs when building the EGL support with Mesa 7.8 because qtextstream.h needs to be included before anything that defines Status.

Requested by: BlankPage AG
Status: Merged
Source repository: blankpage-patches:egl-mesa-7.8-compilefix
Target repository: qt:4.6
Created at: February 28th, 2010 19:50

Commits that would be merged:

Version 1

Version 1

5d1d426
21538db

Fix build with Mesa 7.8's EGL implementatioon

Showing

Showing 5d1d426-21538db

Comments
Include comments entered inline

→ State changed from New to Merged

Thanks, the patch also fixes builds with namespaces.

Merged as e0534e6cb81894e1fb69ab5c1855aee09db31ead to 4.6.

Thiago Macieira | 2010-03-05 16:07:44 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/483

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/qt/qt.git \
  refs/merge-requests/483

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit 4.6..merge-requests/483

# To apply the changes to your branch:
git checkout 4.6
git merge merge-requests/483
git push origin 4.6

Reviewing merge request #483: Fix build with Mesa 7.8's EGL implementation

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline