Bug 58104 - [Qt] Don't link against fontconfig or X11 if embedded
Summary: [Qt] Don't link against fontconfig or X11 if embedded
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: Other Linux
: P3 Normal
Assignee: Nobody
URL:
Keywords: Qt, QtTriaged
Depends on:
Blocks:
 
Reported: 2011-04-07 17:48 PDT by Keith Kyzivat
Modified: 2011-04-09 11:04 PDT (History)
7 users (show)

See Also:


Attachments
Patch (5.36 KB, patch)
2011-04-08 09:02 PDT, Keith Kyzivat
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Keith Kyzivat 2011-04-07 17:48:37 PDT
Don't link against fontconfig or x11 environments if in CONFIG += embedded environments.

These environments do not have fontconfig nor x11.
Comment 1 Keith Kyzivat 2011-04-08 09:02:27 PDT
Created attachment 88828 [details]
Patch
Comment 2 Laszlo Gombos 2011-04-08 12:53:26 PDT
Comment on attachment 88828 [details]
Patch

r=me.
Comment 3 WebKit Commit Bot 2011-04-08 17:59:00 PDT
Comment on attachment 88828 [details]
Patch

Rejecting attachment 88828 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'land-a..." exit_code: 2

Last 500 characters of output:
m/tests/WebFrameTest.cpp
	M	Source/WebKit/chromium/WebKit.gyp
	M	Source/WebKit/chromium/ChangeLog
	M	Source/WebKit/chromium/src/WebFrameImpl.cpp
	M	Source/WebKit/chromium/WebKit.gypi
	M	Source/WebKit/chromium/public/WebFrame.h
r83366 = cb515feb73a489b0e3d7d0469739e4dadcd813b9 (refs/remotes/trunk)
	M	Source/WebCore/ChangeLog
r83367 = 98f07a0f2641d491b2f2d947d4a2b74273eddb07 (refs/remotes/trunk)
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/trunk.

Full output: http://queues.webkit.org/results/8380129
Comment 4 Keith Kyzivat 2011-04-09 08:51:57 PDT
I'm not clear why the commit bot reported error -- it seems unrelated. (?)
Comment 5 Balazs Kelemen 2011-04-09 10:44:16 PDT
(In reply to comment #4)
> I'm not clear why the commit bot reported error -- it seems unrelated. (?)

It is. I'm going to commit the patch.
Comment 6 Balazs Kelemen 2011-04-09 10:59:08 PDT
Committed r83380: <http://trac.webkit.org/changeset/83380>
Comment 7 Balazs Kelemen 2011-04-09 11:03:15 PDT
The reason of the commit error is that you left the "No new tests. (Oops!)" text in WebCore/ChangeLog.
Comment 8 Balazs Kelemen 2011-04-09 11:04:02 PDT
Comment on attachment 88828 [details]
Patch

Clearing flags.