Title: [157926] trunk/Source/WebCore
- Revision
- 157926
- Author
- [email protected]
- Date
- 2013-10-24 06:30:12 -0700 (Thu, 24 Oct 2013)
Log Message
Removed Qt workaround.
https://bugs.webkit.org/show_bug.cgi?id=123258
Patch by Peter Molnar <[email protected]> on 2013-10-24
Reviewed by Csaba Osztrogonác.
No change of functionality, no new tests needed.
!$defines case can be removed, because Qt and Android aren't in WebKit trunk,
all ports (Mac,EFL,GTK,Windows) call this script with --defines option now
* css/make-css-file-arrays.pl:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (157925 => 157926)
--- trunk/Source/WebCore/ChangeLog 2013-10-24 13:28:28 UTC (rev 157925)
+++ trunk/Source/WebCore/ChangeLog 2013-10-24 13:30:12 UTC (rev 157926)
@@ -1,3 +1,17 @@
+2013-10-24 Peter Molnar <[email protected]>
+
+ Removed Qt workaround.
+ https://bugs.webkit.org/show_bug.cgi?id=123258
+
+ Reviewed by Csaba Osztrogonác.
+
+ No change of functionality, no new tests needed.
+
+ !$defines case can be removed, because Qt and Android aren't in WebKit trunk,
+ all ports (Mac,EFL,GTK,Windows) call this script with --defines option now
+
+ * css/make-css-file-arrays.pl:
+
2013-10-24 Antti Koivisto <[email protected]>
Remove a stray space.
Modified: trunk/Source/WebCore/css/make-css-file-arrays.pl (157925 => 157926)
--- trunk/Source/WebCore/css/make-css-file-arrays.pl 2013-10-24 13:28:28 UTC (rev 157925)
+++ trunk/Source/WebCore/css/make-css-file-arrays.pl 2013-10-24 13:30:12 UTC (rev 157926)
@@ -46,18 +46,8 @@
# Slurp in the CSS file.
my $text;
- # We should not set --defines option and run "moc" preprocessor on Qt.
- # See http://webkit.org/b/37296.
- if (!$defines) {
- open IN, "<", $in or die;
- { local $/; $text = <IN>; }
- close IN;
- # Remove preprocessor directives.
- $text =~ s|^#.*?$||mg;
- } else {
- require preprocessor;
- $text = join('', applyPreprocessor($in, $defines, $preprocessor));
- }
+ require preprocessor;
+ $text = join('', applyPreprocessor($in, $defines, $preprocessor));
# Remove comments in a simple-minded way that will work fine for our files.
# Could do this a fancier way if we were worried about arbitrary CSS source.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
