From 0529dc9b2542dcb46c2e2cc1a3422fc83c6ae6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Wed, 5 Jun 2013 14:11:06 +0200 Subject: Correct error in Makefile generation for Windows MinGW. Remove the build_pass check that was added for vcproj generation as it is no longer deemed necessary. See http://trac.webkit.org/changeset/62264 and http://trac.webkit.org/changeset/59266 for context. Task-number: QTBUG-27413 Change-Id: Ie82032cf4b183b31c66defc2d49cc8095989ec8f Reviewed-by: Jocelyn Turcotte --- src/3rdparty/webkit/Source/WebKit.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri index ae7b99c..01f88a4 100644 --- a/src/3rdparty/webkit/Source/WebKit.pri +++ b/src/3rdparty/webkit/Source/WebKit.pri @@ -49,7 +49,7 @@ building-libs { LIBS += -framework $$QTWEBKITLIBNAME QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH } else { - build_pass: win32-*|wince* { + win32-*|wince* { !CONFIG(release, debug|release): QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}$${QT_MAJOR_VERSION} win32-g++*: LIBS += -l$$QTWEBKITLIBNAME -- cgit v0.12