Title: [94407] trunk/Tools
- Revision
- 94407
- Author
- o...@webkit.org
- Date
- 2011-09-02 04:36:40 -0700 (Fri, 02 Sep 2011)
Log Message
[Qt] Build dependency problems
https://bugs.webkit.org/show_bug.cgi?id=38054
Trivial fix after r94288.
Rubber-stamped by Andras Becsi.
* Scripts/webkitdirs.pm: We should read the whole defaults.txt, not only the first two lines.
(buildQMakeProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (94406 => 94407)
--- trunk/Tools/ChangeLog 2011-09-02 11:19:35 UTC (rev 94406)
+++ trunk/Tools/ChangeLog 2011-09-02 11:36:40 UTC (rev 94407)
@@ -1,3 +1,15 @@
+2011-09-02 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt] Build dependency problems
+ https://bugs.webkit.org/show_bug.cgi?id=38054
+
+ Trivial fix after r94288.
+
+ Rubber-stamped by Andras Becsi.
+
+ * Scripts/webkitdirs.pm: We should read the whole defaults.txt, not only the first two lines.
+ (buildQMakeProject):
+
2011-09-02 Andras Becsi <andras.be...@nokia.com>
Remove my old e-mail address and add my new one.
Modified: trunk/Tools/Scripts/webkitdirs.pm (94406 => 94407)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-09-02 11:19:35 UTC (rev 94406)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-09-02 11:36:40 UTC (rev 94407)
@@ -1687,7 +1687,9 @@
my $pathToDefaultsTxt = File::Spec->catfile( $dir, "defaults.txt" );
my $defaultsTxt = "";
if(open DEFAULTS, "$pathToDefaultsTxt"){
- $defaultsTxt = <DEFAULTS>.<DEFAULTS>;
+ while (<DEFAULTS>) {
+ $defaultsTxt .= $_;
+ }
close (DEFAULTS);
}
if(not($defaults eq $defaultsTxt)){
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
