Title: [106363] trunk/Tools
- Revision
- 106363
- Author
- [email protected]
- Date
- 2012-01-31 09:11:45 -0800 (Tue, 31 Jan 2012)
Log Message
If the QTDIR environment variable is set, the build system fails to compile WinCairo
https://bugs.webkit.org/show_bug.cgi?id=77112
Reviewed by Daniel Bates.
* Scripts/webkitdirs.pm:
(determineIsQt):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (106362 => 106363)
--- trunk/Tools/ChangeLog 2012-01-31 17:09:13 UTC (rev 106362)
+++ trunk/Tools/ChangeLog 2012-01-31 17:11:45 UTC (rev 106363)
@@ -1,3 +1,13 @@
+2012-01-31 Csaba Osztrogonác <[email protected]>
+
+ If the QTDIR environment variable is set, the build system fails to compile WinCairo
+ https://bugs.webkit.org/show_bug.cgi?id=77112
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitdirs.pm:
+ (determineIsQt):
+
2012-01-31 Adam Roben <[email protected]>
Only call -typingAttributes on WebViews, not WebHTMLViews
Modified: trunk/Tools/Scripts/webkitdirs.pm (106362 => 106363)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-01-31 17:09:13 UTC (rev 106362)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-01-31 17:11:45 UTC (rev 106363)
@@ -879,12 +879,12 @@
return;
}
- # The presence of QTDIR only means Qt if --gtk or --wx or --efl or --blackberry or --chromium are not on the command-line
- if (isGtk() || isWx() || isEfl() || isBlackBerry() || isChromium()) {
+ # The presence of QTDIR only means Qt if --gtk or --wx or --efl or --blackberry or --chromium or --wincairo are not on the command-line
+ if (isGtk() || isWx() || isEfl() || isBlackBerry() || isChromium() || isWinCairo()) {
$isQt = 0;
return;
}
-
+
$isQt = defined($ENV{'QTDIR'});
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
