Title: [101382] trunk/Tools
- Revision
- 101382
- Author
- hausm...@webkit.org
- Date
- 2011-11-29 08:10:05 -0800 (Tue, 29 Nov 2011)
Log Message
[Qt] Fix debug-shlib build without webkit2
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/qtwebkit.prf: Respect no_webkit2.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101381 => 101382)
--- trunk/Tools/ChangeLog 2011-11-29 16:01:30 UTC (rev 101381)
+++ trunk/Tools/ChangeLog 2011-11-29 16:10:05 UTC (rev 101382)
@@ -1,3 +1,11 @@
+2011-11-29 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Fix debug-shlib build without webkit2
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/qtwebkit.prf: Respect no_webkit2.
+
2011-11-28 Csaba Osztrogonác <o...@webkit.org>
[Qt][WK2] Unreviewed buildfix after r101307.
Modified: trunk/Tools/qmake/mkspecs/features/qtwebkit.prf (101381 => 101382)
--- trunk/Tools/qmake/mkspecs/features/qtwebkit.prf 2011-11-29 16:01:30 UTC (rev 101381)
+++ trunk/Tools/qmake/mkspecs/features/qtwebkit.prf 2011-11-29 16:10:05 UTC (rev 101382)
@@ -27,7 +27,8 @@
INCLUDEPATH += $${ROOT_BUILD_DIR}/include/QtWebKit
force_static_libs_as_shared {
- LIBS += -lwebkit2 -lwebcore -ljscore -lwtf
+ !no_webkit2: LIBS += -lwebkit2
+ LIBS += -lwebcore -ljscore -lwtf
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
