Changeset 136461 in webkit

Timestamp:

Dec 3, 2012, 5:38:59 PM (12 years ago)

Author:

pierre.rossi@gmail.com

Message:

[Qt] another stab at fixing the windows build

It seems the QT_BUILD_{TARGET}_LIB are not set as they should by qt_module.prf.
Define them by hand to be on the safe side.

.:

• Source/widgetsapi.pri:

Source/WebKit:

• WebKit1.pro:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebKit1.pro (modified) (1 diff)
• Source/widgetsapi.pri (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-12-03  Pierre Rossi  <pierre.rossi@digia.com>
+
+        [Qt] another stab at fixing the windows build 
+
+        It seems the QT_BUILD_{TARGET}_LIB are not set as they should by qt_module.prf.
+        Define them by hand to be on the safe side.
+
+        * Source/widgetsapi.pri:
+
 2012-12-03  Alexis Menard  <alexis@webkit.org>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-12-03  Pierre Rossi  <pierre.rossi@digia.com>
+
+        [Qt] another stab at fixing the windows build 
+
+        It seems the QT_BUILD_{TARGET}_LIB are not set as they should by qt_module.prf.
+        Define them by hand to be on the safe side.
+
+        * WebKit1.pro:
+
 2012-11-30  Simon Hausmann  <simon.hausmann@digia.com>, Pierre Rossi  <pierre.rossi@digia.com>
 

trunk/Source/WebKit/WebKit1.pro

@@ -12 +12 @@
 WEBKIT += wtf javascriptcore webcore
 QT += gui
+
+# This is relied upon by our export macros and seems not to be properly
+# defined by the logic in qt_module.prf as it should
+DEFINES += QT_BUILD_WEBKIT_LIB
 
 CONFIG += staticlib

trunk/Source/widgetsapi.pri

@@ -10 +10 @@
 TEMPLATE = lib
 TARGET = QtWebKitWidgets
+
+# This is relied upon by our export macros and seems not to be properly
+# defined by the logic in qt_module.prf as it should
+DEFINES += QT_BUILD_WEBKITWIDGETS_LIB
 
 WEBKIT_DESTDIR = $${ROOT_BUILD_DIR}/lib