Title: [94075] trunk/Source
- Revision
- 94075
- Author
- [email protected]
- Date
- 2011-08-30 06:57:37 -0700 (Tue, 30 Aug 2011)
Log Message
[Qt] Do not unconditionally use pkg-config in .pro files
https://bugs.webkit.org/show_bug.cgi?id=67055
Reviewed by Andreas Kling.
Original patch from Rohan McGovern <[email protected]>
Using the first pkg-config in PATH is prone to errors when cross
compiling inside the Qt repository (using Qt's build-system).
This patch protect calls for pkg-config with
!contains(QT_CONFIG, no-pkg-config). no-pkg-config is added to
QT_CONFIG by Qt's 'configure' when cross-compiling on systems
without pkg-config.
The respective change in Qt's configure has been submited already.
No new tests as this is just a build change.
Source/_javascript_Core:
* wtf/wtf.pri: protect pkg-config calls
Source/WebCore:
* features.pri: protect pkg-config calls
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (94074 => 94075)
--- trunk/Source/_javascript_Core/ChangeLog 2011-08-30 13:16:38 UTC (rev 94074)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-08-30 13:57:37 UTC (rev 94075)
@@ -1,3 +1,26 @@
+2011-08-30 Ademar de Souza Reis Jr. <[email protected]>
+
+ [Qt] Do not unconditionally use pkg-config in .pro files
+ https://bugs.webkit.org/show_bug.cgi?id=67055
+
+ Reviewed by Andreas Kling.
+
+ Original patch from Rohan McGovern <[email protected]>
+
+ Using the first pkg-config in PATH is prone to errors when cross
+ compiling inside the Qt repository (using Qt's build-system).
+
+ This patch protect calls for pkg-config with
+ !contains(QT_CONFIG, no-pkg-config). no-pkg-config is added to
+ QT_CONFIG by Qt's 'configure' when cross-compiling on systems
+ without pkg-config.
+
+ The respective change in Qt's configure has been submited already.
+
+ No new tests as this is just a build change.
+
+ * wtf/wtf.pri: protect pkg-config calls
+
2011-08-29 Daniel Bates <[email protected]>
Add HAVE(VASPRINTF) macro to test for vasprintf() support
Modified: trunk/Source/_javascript_Core/wtf/wtf.pri (94074 => 94075)
--- trunk/Source/_javascript_Core/wtf/wtf.pri 2011-08-30 13:16:38 UTC (rev 94074)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri 2011-08-30 13:57:37 UTC (rev 94075)
@@ -42,7 +42,7 @@
wtf/unicode/UTF8.cpp
linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+ !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
DEFINES += ENABLE_GLIB_SUPPORT=1
PKGCONFIG += glib-2.0 gio-2.0
CONFIG += link_pkgconfig
Modified: trunk/Source/WebCore/ChangeLog (94074 => 94075)
--- trunk/Source/WebCore/ChangeLog 2011-08-30 13:16:38 UTC (rev 94074)
+++ trunk/Source/WebCore/ChangeLog 2011-08-30 13:57:37 UTC (rev 94075)
@@ -1,3 +1,26 @@
+2011-08-30 Ademar de Souza Reis Jr. <[email protected]>
+
+ [Qt] Do not unconditionally use pkg-config in .pro files
+ https://bugs.webkit.org/show_bug.cgi?id=67055
+
+ Reviewed by Andreas Kling.
+
+ Original patch from Rohan McGovern <[email protected]>
+
+ Using the first pkg-config in PATH is prone to errors when cross
+ compiling inside the Qt repository (using Qt's build-system).
+
+ This patch protect calls for pkg-config with
+ !contains(QT_CONFIG, no-pkg-config). no-pkg-config is added to
+ QT_CONFIG by Qt's 'configure' when cross-compiling on systems
+ without pkg-config.
+
+ The respective change in Qt's configure has been submited already.
+
+ No new tests as this is just a build change.
+
+ * features.pri: protect pkg-config calls
+
2011-08-30 Andreas Kling <[email protected]>
HTMLImageElement: Don't cache "ismap" and "usemap" attributes.
Modified: trunk/Source/WebCore/features.pri (94074 => 94075)
--- trunk/Source/WebCore/features.pri 2011-08-30 13:16:38 UTC (rev 94074)
+++ trunk/Source/WebCore/features.pri 2011-08-30 13:57:37 UTC (rev 94075)
@@ -196,7 +196,7 @@
DEFINES += WTF_USE_QTKIT=1
DEFINES -= WTF_USE_QTKIT=0
} else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+ !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
DEFINES += WTF_USE_GSTREAMER=1
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
