diff options
| author | jocelyn.turcotte <jocelyn.turcotte@digia.com> | 2012-12-12 10:12:57 +0000 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2012-12-12 13:39:40 +0100 |
| commit | 472835a143d1c2b78285c36a61117ebe24aab882 (patch) | |
| tree | 3e326f6f5a6c5ff5d8327eaa6978e45d0907ca61 | |
| parent | 9f8b18ba75439d607ee9d36624c73368bdab08ba (diff) | |
| download | qtwebkit-472835a143d1c2b78285c36a61117ebe24aab882.tar.gz | |
[Qt] Fix the inspector not showing up on Windows
https://bugs.webkit.org/show_bug.cgi?id=104677
Reviewed by Simon Hausmann.
.:
Resources aren't transfered properly from a static WebCore to the final DLL
with MSVC since the linker only pick from the static lib symbols that
are referenced in the final binary.
Move the resource files directly to Qt5WebKit.dll to make sure that they are
available.
* Source/api.pri:
Source/WebCore:
* Target.pri:
Change-Id: I7cf1a830ee4482fc36a6e6c4115325c6c3b947b5
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | Source/WebCore/ChangeLog | 9 | ||||
| -rw-r--r-- | Source/WebCore/Target.pri | 9 | ||||
| -rw-r--r-- | Source/api.pri | 11 |
4 files changed, 36 insertions, 9 deletions
@@ -1,3 +1,19 @@ +2012-12-11 Jocelyn Turcotte <jocelyn.turcotte@digia.com> + + [Qt] Fix the inspector not showing up on Windows + https://bugs.webkit.org/show_bug.cgi?id=104677 + + Reviewed by Simon Hausmann. + + Resources aren't transfered properly from a static WebCore to the final DLL + with MSVC since the linker only pick from the static lib symbols that + are referenced in the final binary. + + Move the resource files directly to Qt5WebKit.dll to make sure that they are + available. + + * Source/api.pri: + 2012-12-10 Jocelyn Turcotte <jocelyn.turcotte@digia.com> [Qt] Remove the support for building a debug WebKit with a release Qt diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 045e17e1a..887a5d370 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2012-12-11 Jocelyn Turcotte <jocelyn.turcotte@digia.com> + + [Qt] Fix the inspector not showing up on Windows + https://bugs.webkit.org/show_bug.cgi?id=104677 + + Reviewed by Simon Hausmann. + + * Target.pri: + 2012-12-12 Simon Hausmann <simon.hausmann@digia.com> [Qt] Fix build on Mac diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index fc9a8959e..cf1370fce 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -14,15 +14,6 @@ WEBKIT += javascriptcore CONFIG += staticlib -RESOURCES += \ - $$PWD/WebCore.qrc - -include_webinspector { - RESOURCES += \ - $$PWD/inspector/front-end/WebKit.qrc \ - $${WEBCORE_GENERATED_SOURCES_DIR}/InspectorBackendCommands.qrc -} - SOURCES += \ Modules/geolocation/Geolocation.cpp \ Modules/geolocation/GeolocationController.cpp \ diff --git a/Source/api.pri b/Source/api.pri index 7a388670a..5e09f3d4d 100644 --- a/Source/api.pri +++ b/Source/api.pri @@ -43,6 +43,17 @@ QMAKE_DOCS = $$PWD/qtwebkit.qdocconf # on the QT variable can be picked up when we later load(qt_module). load(webkit_modules) +# Resources have to be included directly in the final binary. +# MSVC's linker won't pick them from a static library since they aren't referenced. +RESOURCES += $$PWD/WebCore/WebCore.qrc +include_webinspector { + # WEBCORE_GENERATED_SOURCES_DIR is defined in WebCore.pri, included by + # load(webkit_modules) if WEBKIT contains webcore. + RESOURCES += \ + $$PWD/WebCore/inspector/front-end/WebKit.qrc \ + $${WEBCORE_GENERATED_SOURCES_DIR}/InspectorBackendCommands.qrc +} + # ---------------- Custom developer-build handling ------------------- # # The assumption for Qt developer builds is that the module file |