From 65ee9d32bb0213cabda0e4d63f6272b9676dd4a1 Mon Sep 17 00:00:00 2001 From: "ossy@webkit.org" Date: Thu, 26 Jan 2012 13:43:26 +0000 Subject: [PATCH] [Qt][Win] One more speculative buildfix after r105970. Source/JavaScriptCore: * JavaScriptCore.pri: Source/WTF: * WTF.pri: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105995 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/JavaScriptCore/ChangeLog | 6 ++++++ Source/JavaScriptCore/JavaScriptCore.pri | 1 - Source/WTF/ChangeLog | 6 ++++++ Source/WTF/WTF.pri | 5 ++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 9d50575..6584b38 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,5 +1,11 @@ 2012-01-26 Csaba Osztrogonác + [Qt][Win] One more speculative buildfix after r105970. + + * JavaScriptCore.pri: + +2012-01-26 Csaba Osztrogonác + [Qt][Win] Speculative buildfix after r105970. * JavaScriptCore.pri: Link lgdi for DeleteObject() and DeleteDC(). diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri index 2b7115b..65e0eb3 100644 --- a/Source/JavaScriptCore/JavaScriptCore.pri +++ b/Source/JavaScriptCore/JavaScriptCore.pri @@ -31,7 +31,6 @@ INCLUDEPATH += \ win32-* { DEFINES += _HAS_TR1=0 LIBS += -lwinmm - LIBS += -lgdi32 win32-g++* { LIBS += -lpthreadGC2 diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index ee3aa11..c08cf85 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,9 @@ +2012-01-26 Csaba Osztrogonác + + [Qt][Win] One more speculative buildfix after r105970. + + * WTF.pri: + 2012-01-26 Nikolas Zimmermann Not reviewed. Try to fix Qt/Win build by building OwnPtrWin.cpp into the WTF library. diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index 7fde97d..a601f1c 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -40,4 +40,7 @@ linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) { } } -win32-*: LIBS += -lwinmm +win32-* { + LIBS += -lwinmm + LIBS += -lgdi32 +} -- 2.7.4