Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Fixup wrong merge: remove src/qt/src #12427

Closed
milianw opened this issue Aug 6, 2014 · 1 comment
Closed

Fixup wrong merge: remove src/qt/src #12427

milianw opened this issue Aug 6, 2014 · 1 comment
Assignees
@vitallium
Milestone
Release 2.0

Comments

@milianw
Copy link
Contributor

milianw commented Aug 6, 2014

current master branch has src/qt/src which contains files that probably resulted from a wrong merge of the qt5 code. This folder should be removed and, if necessary, its contents/patches rebased on top of the Qt5 code in src/qtbase or src/qtwebkit.
@milianw milianw mentioned this issue Aug 6, 2014
Closed
@milianw
Copy link
Contributor Author

milianw commented Aug 6, 2014

see also: #11264 and #11590

@milianw milianw mentioned this issue Aug 6, 2014
Merged
@JamesMGreene JamesMGreene added this to the Release 2.0 milestone Aug 11, 2014
vitallium pushed a commit to vitallium/qtwebkit that referenced this issue Oct 10, 2015
@milianw
Fixup wrong merge: remove src/qt/src
26d0eb5 
This reapplies the patch of issue #11590 and drops the patch
from issue #11264. The former is still valid, while the latter
is hopefully resolved properly in Qt5 (see e.g. this:
https://bugs.webkit.org/show_bug.cgi?id=69419).

ariya/phantomjs#12427
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@vitallium vitallium

Labels
None yet
Projects
None yet
Milestone
Release 2.0
Development

No branches or pull requests
3 participants
@milianw @JamesMGreene @vitallium