summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-03-30 17:49:58 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-03-30 17:49:58 (GMT)
commit456fdf4e5fe05e94955df0fc7d76c384a0bcfbc5 (patch)
treed3c33ff991a45483c8465a64b08a6adeb6e3f7a0
parent7e3df09fea0d3177d07f0262d034065e90eb3263 (diff)
downloadQt-456fdf4e5fe05e94955df0fc7d76c384a0bcfbc5.zip
Qt-456fdf4e5fe05e94955df0fc7d76c384a0bcfbc5.tar.gz
Qt-456fdf4e5fe05e94955df0fc7d76c384a0bcfbc5.tar.bz2
Re-add line that was lost during webkit update.
Doing a 'make sis' expects the dll in the libdir, so place it there. This fixes out-of-source building to always put the dll in the exepcted dir. https://bugs.webkit.org/show_bug.cgi?id=36749
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index e24e9e2..06e3a84 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -12,6 +12,7 @@ symbian: {
TARGET.UID3 = 0xE00267C2
}
webkitlibs.sources = QtWebKit$${QT_LIBINFIX}.dll
+ CONFIG(QTDIR_build)|: webkitlibs.sources = $$QMAKE_LIBDIR_QT/$$webkitlibs.sources
webkitlibs.path = /sys/bin
vendorinfo = \
"; Localised Vendor name" \