[Qt] Add the "d" suffix to QtWebKit's dll on Windows.

Reviewed by Tor Arne Vestbø.

* WebKit.pri:

WebCore:

* WebCore.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53924 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fbeecb2c
2010-01-27 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Tor Arne Vestbø.
[Qt] Add the "d" suffix to QtWebKit's dll on Windows.
* WebKit.pri:
2010-01-27 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Unreviewed build fix
......
2010-01-27 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Tor Arne Vestbø.
[Qt] Add the "d" suffix to QtWebKit's dll on Windows.
* WebCore.pro:
2010-01-27 Matt Perry <mpcomplete@chromium.org>
Reviewed by Eric Seidel.
......@@ -2659,6 +2659,7 @@ HEADERS += $$WEBKIT_API_HEADERS
win32-*|wince* {
DLLDESTDIR = $$OUTPUT_DIR/bin
TARGET = $$qtLibraryTarget($$TARGET)
dlltarget.commands = $(COPY_FILE) $(DESTDIR)$(TARGET) $$[QT_INSTALL_BINS]
dlltarget.CONFIG = no_path
......
......@@ -28,12 +28,14 @@ building-libs {
QT += webkit
} else {
QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
QTWEBKITLIBNAME = QtWebKit
mac:!static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
LIBS += -framework QtWebKit
LIBS += -framework $$QTWEBKITLIBNAME
QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH
} else {
win32-*|wince* {
QTWEBKITLIBNAME = QtWebKit$${QT_MAJOR_VERSION}
CONFIG(debug, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d
QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}$${QT_MAJOR_VERSION}
win32-g++: LIBS += -l$$QTWEBKITLIBNAME
else: LIBS += $${QTWEBKITLIBNAME}.lib
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment