Title: [136461] trunk
- Revision
- 136461
- Author
- pierre.ro...@gmail.com
- Date
- 2012-12-03 17:38:59 -0800 (Mon, 03 Dec 2012)
Log 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (136460 => 136461)
--- trunk/ChangeLog 2012-12-04 01:20:59 UTC (rev 136460)
+++ trunk/ChangeLog 2012-12-04 01:38:59 UTC (rev 136461)
@@ -1,3 +1,12 @@
+2012-12-03 Pierre Rossi <pierre.ro...@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 <ale...@webkit.org>
[EFL] Enable CSS3 background-position offsets by default.
Modified: trunk/Source/WebKit/ChangeLog (136460 => 136461)
--- trunk/Source/WebKit/ChangeLog 2012-12-04 01:20:59 UTC (rev 136460)
+++ trunk/Source/WebKit/ChangeLog 2012-12-04 01:38:59 UTC (rev 136461)
@@ -1,3 +1,12 @@
+2012-12-03 Pierre Rossi <pierre.ro...@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.hausm...@digia.com>, Pierre Rossi <pierre.ro...@digia.com>
[Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets
Modified: trunk/Source/WebKit/WebKit1.pro (136460 => 136461)
--- trunk/Source/WebKit/WebKit1.pro 2012-12-04 01:20:59 UTC (rev 136460)
+++ trunk/Source/WebKit/WebKit1.pro 2012-12-04 01:38:59 UTC (rev 136461)
@@ -12,6 +12,10 @@
WEBKIT += wtf _javascript_core 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
SOURCES += \
Modified: trunk/Source/widgetsapi.pri (136460 => 136461)
--- trunk/Source/widgetsapi.pri 2012-12-04 01:20:59 UTC (rev 136460)
+++ trunk/Source/widgetsapi.pri 2012-12-04 01:38:59 UTC (rev 136461)
@@ -10,6 +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
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes