[Webkit-unassigned] [Bug 36749] [Qt] Shadowbuilds of webcore with Qt fails.

[bugzilla-daemon at webkit.org]

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


Simon Hausmann <hausmann at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #51895|review?, commit-queue?      |review-, commit-queue-
               Flag|                            |




--- Comment #3 from Simon Hausmann <hausmann at webkit.org>  2010-03-29 04:01:19 PST ---
(From update of attachment 51895)
> diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
> index a788d95..41629af 100644
> --- a/WebCore/ChangeLog
> +++ b/WebCore/ChangeLog
> @@ -1,3 +1,11 @@
> +2010-03-29  Thomas Zander  <t.zander at nokia.com>
> +
> +        Reviewed by NOBODY
> +
> +        Qt qmake out-of-source builds failed
> +
> +        * WebCore.pro: Fix for shadow builds
> +
>  2010-03-26  Andrey Kosyakov  <caseq at chromium.org>

Please explain in the ChangeLog why the build broke and add a link to this
bugzilla entry.

>          Reviewed by Pavel Feldman.
> diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
> index 15c881f..700f20c 100644
> --- a/WebCore/WebCore.pro
> +++ b/WebCore/WebCore.pro
> @@ -11,7 +11,7 @@ symbian: {
>      } else {
>          TARGET.UID3 = 0xE00267C2
>      }
> -    webkitlibs.sources = QtWebKit$${QT_LIBINFIX}.dll
> +    webkitlibs.sources = $$QMAKE_LIBDIR_QT/QtWebKit$${QT_LIBINFIX}.dll

What's $$QMAKE_LIBDIR_QT set to with sbsv2/abld builds? Doesn't the dll end up
in epoc32/release/armv6/urel, too?

Or does the sbs2/abld build system place the dll into both locations?

Either way, this looks like the right thing to do for the plain makefile
builds, but it will break when building WebKit outside of Qt, where we
certainly don't place the dll in $$QMAKE_LIBDIR_QT after linking. One option
would be to do it like this:

webkitlibs.sources = QtWebKit$${QT_LIBINFIX}.dll
CONFIG(QTDIR_build): webkitlibs.sources =
$$QMAKE_LIBDIR_QT/$$webkitlibs.sources

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.