Bug 38439 – [Qt] QT_MOBILE_THEME compile time flag

• Status: CLOSED
• Resolution: FIXED
• Component: Platform

[Luiz Agostini]

replacing preprocessor conditional used in RenderThemeQt from Q_WS_MAEMO_5 to USE(QT_MOBILE_THEME).

[Luiz Agostini]

Created attachment 54888 [details]
patch 1

[WebKit Commit Bot]

Comment on attachment 54888 [details]
patch 1

Rejecting patch 54888 from commit-queue.

Found no modified ChangeLogs, cannot create a commit message.
All changes require a ChangeLog.  See:
http://webkit.org/coding/contributing.html

[Luiz Agostini]

Created attachment 54917 [details]
patch 2

[Luiz Agostini]

(In reply to comment #2)
> (From update of attachment 54888 [details])
> Rejecting patch 54888 from commit-queue.
> 
> Found no modified ChangeLogs, cannot create a commit message.
> All changes require a ChangeLog.  See:
> http://webkit.org/coding/contributing.html

ChangeLog is in the patch. It was in the first one and it is in this second one.
For some reason I can' t see it in formatted diff but it is there.

[Eric Seidel (no email)]

webkit-patch apply-attachment 54917 [details]
fails to even apply the patch, so it's difficult for me to know why the ChangeLog is failing to parse.

[Chris Jerdonek]

(In reply to comment #5)
> webkit-patch apply-attachment 54917 [details]
> fails to even apply the patch, so it's difficult for me to know why the
> ChangeLog is failing to parse.

Could this have anything to do with the fact that the diff is an e-mailed diff?  I didn't know we supported those.  Are e-mail diffs relatively common -- or are they rare?

[Chris Jerdonek]

(In reply to comment #4)
> ChangeLog is in the patch. It was in the first one and it is in this second
> one.
> For some reason I can' t see it in formatted diff but it is there.

I see the ChangeLog entry in the "Formatted Diff" for both patch 1 and patch 2.  I'm a bit unclear on what's working and what's not.  For example, patch 1 seemed to apply OK based on the fact that the style bubble is green, but the style bubble is white for patch 2.  On the other hand, Eric says webkit-patch couldn't apply patch 2.  Is the problem present for both patch 1 and patch 2, or just patch 2?

[Chris Jerdonek]

Created attachment 54988 [details]
Test - ignore this patch

Re-attaching patch 2 to see if it applies.

[Chris Jerdonek]

(In reply to comment #5)
> webkit-patch apply-attachment 54917 [details]
> fails to even apply the patch, so it's difficult for me to know why the
> ChangeLog is failing to parse.

This occurred again here:

https://bugs.webkit.org/show_bug.cgi?id=38455#c6

It's also an e-mail diff.  Could this be a regression?

[Chris Jerdonek]

(In reply to comment #9)
> (In reply to comment #5)
> > webkit-patch apply-attachment 54917 [details] [details]
> > fails to even apply the patch, so it's difficult for me to know why the
> > ChangeLog is failing to parse.
> 
> This occurred again here:
> 
> https://bugs.webkit.org/show_bug.cgi?id=38455#c6
> 
> It's also an e-mail diff.  Could this be a regression?

Filed a bug for this here:

https://bugs.webkit.org/show_bug.cgi?id=38507

Will submit a fix shortly.

[Chris Jerdonek]

(In reply to comment #4)
> (In reply to comment #2)
> > (From update of attachment 54888 [details] [details])
> > Rejecting patch 54888 from commit-queue.
> > 
> > Found no modified ChangeLogs, cannot create a commit message.
> > All changes require a ChangeLog.  See:
> > http://webkit.org/coding/contributing.html
> 
> ChangeLog is in the patch. It was in the first one and it is in this second
> one.
> For some reason I can' t see it in formatted diff but it is there.

Hi Luiz, this issue should be resolved now:

https://bugs.webkit.org/show_bug.cgi?id=38507

Your patch should work now if you resubmit it.  Thanks for your patience.

[Luiz Agostini]

Created attachment 55028 [details]
patch 3

[Antonio Gomes]

Comment on attachment 55028 [details]
patch 3

I think it needs a r+ flag as well for cq to work.

even when we know it is just a fixed up version of a already r+_with_changes patch, cq might not be that smart

[Eric Seidel (no email)]

The CQ does not require an r+ to work, no.  It uses the r+ to set the reviewer in the ChangeLog.  It will fail to commit if there is no reviewer in the ChangeLog however.

[WebKit Commit Bot]

Comment on attachment 55028 [details]
patch 3

Clearing flags on attachment: 55028

Committed r58788: <http://trac.webkit.org/changeset/58788>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Simon Hausmann]

Revision r58788 cherry-picked into qtwebkit-2.0 with commit b4aa5e1ddc41edab895132aba3cc66d9d7129444