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

Include Web Inspector resources. #12899

Closed
wants to merge 1 commit into from
Closed

Include Web Inspector resources. #12899

wants to merge 1 commit into from

Conversation

vitallium
Copy link
Collaborator

Include Web Inspector resources.

Fixes #12864

This was referenced Jan 24, 2015
Closed
Closed
@ariya ariya added this to the Release 2.0.1 milestone Jan 24, 2015
@ariya
Copy link
Owner

ariya commented Jan 24, 2015

Landed. Thanks!

@ariya ariya closed this Jan 24, 2015
@ariya ariya reopened this Jan 25, 2015
@ariya
Copy link
Owner

ariya commented Jan 25, 2015

It causes the following error on OS X:

duplicate symbol __Z21qInitResources_WebKitv in:
    qrc_WebKit.o
    /Users/ariya/dev/ariya/phantomjs/src/qt/qtwebkit/Source/WebCore/release/libWebCore.a(qrc_WebKit.o)
duplicate symbol __Z24qCleanupResources_WebKitv in:
    qrc_WebKit.o
    /Users/ariya/dev/ariya/phantomjs/src/qt/qtwebkit/Source/WebCore/release/libWebCore.a(qrc_WebKit.o)
duplicate symbol __Z39qInitResources_InspectorBackendCommandsv in:
    qrc_InspectorBackendCommands.o
    /Users/ariya/dev/ariya/phantomjs/src/qt/qtwebkit/Source/WebCore/release/libWebCore.a(qrc_InspectorBackendCommands.o)
duplicate symbol __Z42qCleanupResources_InspectorBackendCommandsv in:
    qrc_InspectorBackendCommands.o
    /Users/ariya/dev/ariya/phantomjs/src/qt/qtwebkit/Source/WebCore/release/libWebCore.a(qrc_InspectorBackendCommands.o)
ld: 4 duplicate symbols for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)

@vitallium
Copy link
Collaborator Author

I'll check it.

@vitallium
Copy link
Collaborator Author

Fixed. Will update this PR soon.

@vitallium vitallium mentioned this pull request Feb 2, 2015
Closed
This was referenced Feb 3, 2015
Closed
Closed
@Rui-Santos Rui-Santos mentioned this pull request Feb 4, 2015
Closed
@ariya
Copy link
Owner

ariya commented Feb 5, 2015

@vitallium It's not clear to me which part fixes it since I landed your earlier commit. Could you double check if the current 2.0 looks good?

@vitallium
Copy link
Collaborator Author

This one is fixes Webkit Resources. Linux (and OS X) build already has resources. But on Windows we should include them directly. But I'll check.

@ariya
Copy link
Owner

ariya commented Feb 5, 2015

@vitallium Sounds good, I'll close this one and please open a new PR if there are still changes needed. Thanks!

@ariya ariya closed this Feb 5, 2015
vitallium added a commit that referenced this pull request Feb 7, 2015
@vitallium @ariya
Don't include inspector resources.
26ed336 
They are already linked in QtWebkit on Linux/OS X.

(See issue #12864 and #12899).
@zackw zackw modified the milestones: Release 2.0.1, Release 2.1 Dec 23, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vitallium @ariya @zackw