Reviewing merge request #478: fixed treatment of zlib on Mac when crossbuilding

The configure script forces system-zlib for Mac, but doesn't consider whether we are cross building. This change fixes this for mingw32 (win32-g++) target.

Requested by: mabrand
Status: Merged
Source repository: mabrands-clone:configure.mac.zlib
Target repository: qt:master
Created at: February 20th, 2010 14:24

Commits that would be merged:

Version 1

Version 1

01498eb
bff7e3f

fixed treatment of zlib on Mac when crossbuilding

Showing

Showing 01498eb-bff7e3f

Comments
Include comments entered inline

→ State changed from New to Merged

Cross-compiling the desktop platforms is not supported.

However, this change is harmless for us, so I’ll accept it. Merged to 4.7 as e489e9bc82823f1922a38f1b0805ac8537b1dc77.

Thiago Macieira | 2010-03-05 16:32:12 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/478

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

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

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

Reviewing merge request #478: fixed treatment of zlib on Mac when crossbuilding

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline