Reviewing merge request #1: Avoid build failure when qt is built without webkit

Qt fails to build if -no-webkit is passed as a configure parameter.
The build fails in maemo5 widgetgallery example.

The build failure can be observed for example by:
EXTRA_CONFIGURE_OPTS="-no-webkit" ./debian/rules build

Requested by: Kimmo Kinnunen
Status: Merged
Source repository: kimmoks-x11-maemo:4.6-fremantle-nowebkit-buildfix
Target repository: x11-maemo:4.6-fremantle
Created at: February 7th, 2010 11:31

Commits that would be merged:

Version 2

Version 1
Version 2

c81525a
91bc88e

Avoid build failure when qt is built without webkit

Showing

Showing c81525a-91bc88e

Comments
Include comments entered inline

→ State changed from New to Merged

Thank you very much for the patch!

I applied it with a small modification with git change 9a4fecc8218e06fb134835bb5bd2d7feb04fa3eb

The change will appear in the public repository soon.

Harald Fernengel | 2010-03-17 14:51:18 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/1

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/+qt-developers/qt/x11-maemo.git \
  refs/merge-requests/1

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

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

Reviewing merge request #1: Avoid build failure when qt is built without webkit

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline