[Qt][Win] One more speculative buildfix after r105970.

Source/JavaScriptCore:

* JavaScriptCore.pri:

Source/WTF:

* WTF.pri:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@105995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 9d5057511ef1be8fa7ff15aae3375e07f1886967..6584b383eef7c183f41d6ab9a8d89042c7e9eaf1 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-26  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [Qt][Win] One more speculative buildfix after r105970.
+
+        * JavaScriptCore.pri:
+
 2012-01-26  Csaba Osztrogonác  <ossy@webkit.org>
 
         [Qt][Win] Speculative buildfix after r105970.

diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
index 2b7115b578f60b37605238416ce5434fe6c9f564..65e0eb31aa9a7f14a4d7dc8e2d38310a1053df45 100644 (file)
--- 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 ee3aa11e9e2c3f9987bbe9b83eb9f49676f3f39c..c08cf8524c5d9f642bb804524638b78fc4fa37fc 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-26  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [Qt][Win] One more speculative buildfix after r105970.
+
+        * WTF.pri:
+
 2012-01-26  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         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 7fde97dc2e73d0e5cd52ae94ee822bcf4bfb1bbf..a601f1c3271d4c3b97a58ead44531e66631b1a54 100644 (file)
--- 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
+}