diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-19 08:45:52 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-19 08:45:52 (GMT) |
| commit | 9547ade2b9cd7c792d98bf06ca8de89c9e560396 (patch) | |
| tree | aa43069092eaaa2078c21c86347c28e3ac41c574 /src/3rdparty/webkit/WebKit.pri | |
| parent | fa608f9094591c146f9170ba485ea2e4d7827dca (diff) | |
| parent | cbb28a77cb295b74d47a5a1923357dd6557bea84 (diff) | |
| download | Qt-9547ade2b9cd7c792d98bf06ca8de89c9e560396.zip Qt-9547ade2b9cd7c792d98bf06ca8de89c9e560396.tar.gz Qt-9547ade2b9cd7c792d98bf06ca8de89c9e560396.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/3rdparty/webkit/WebKit.pri')
| -rw-r--r-- | src/3rdparty/webkit/WebKit.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri index e737039..a3ccd9d 100644 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri @@ -22,7 +22,7 @@ building-libs { QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH } else { win32-*|wince* { - CONFIG(debug, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d + !CONFIG(release, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}$${QT_MAJOR_VERSION} win32-g++: LIBS += -l$$QTWEBKITLIBNAME else: LIBS += $${QTWEBKITLIBNAME}.lib |