Reviewing merge request #1477: windows qdbusxml2cpp bug fix

This patch fixes https://bugreports.qt.nokia.com/browse/QTBUG-17634 "qdbusxml2cpp does not handle CRLF in comments correctly"

Requested by: Ralf Habacker
Status: Rejected
Source repository: rhabackers-qt:4.7
Target repository: qt:4.7
Created at: November 23rd, 2011 08:18

Commits that would be merged:

Version 1

Version 1

f86ca84
17072fd

fixed error generating wrong introspection string in header output file

Showing

Showing f86ca84-17072fd

Comments
Include comments entered inline

Pushed new version 1

Ralf Habacker | 2011-11-23 08:22:20 UTC

→ State changed from New to Rejected

branch closed for non-critical fixes.

Oswald Buddenhagen | 2011-11-29 19:36:29 UTC

Without this patch kde-runtime is not compilable on windows, so i would say this is critical.

Ralf Habacker | 2011-11-29 20:03:23 UTC

→ State changed from Rejected to Updated

Ralf Habacker | 2011-11-30 06:02:08 UTC

critical as in “major data loss or security hole”. nokia is not going to make another release of 4.7 otherwise.

Oswald Buddenhagen | 2011-11-30 19:14:26 UTC

→ State changed from Updated to Rejected

(and 4.8 is out in a few days, so don’t bother. distributors will apply the patch themselves anyway.)

Oswald Buddenhagen | 2011-11-30 19:26:46 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/1477

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

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

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