diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2013-06-05 12:11:06 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-06 22:03:02 (GMT) |
| commit | 0529dc9b2542dcb46c2e2cc1a3422fc83c6ae6ef (patch) | |
| tree | f07c4b5cc343662aec2ffc10820470ffcf78b4e9 | |
| parent | b5f252a7564e5b51689ca3a95125eabaec4ffea4 (diff) | |
| download | Qt-4.8.5.zip Qt-4.8.5.tar.gz Qt-4.8.5.tar.bz2 | |
Correct error in Makefile generation for Windows MinGW.v4.8.5
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 <jocelyn.turcotte@digia.com>
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit.pri | 2 |
1 files changed, 1 insertions, 1 deletions
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 |