diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/ChangeLog | 9 | ||||
| -rw-r--r-- | Source/WebCore/Target.pri | 9 | ||||
| -rw-r--r-- | Source/api.pri | 11 |
3 files changed, 20 insertions, 9 deletions
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 |