Title: [128162] trunk/Tools
- Revision
- 128162
- Author
- [email protected]
- Date
- 2012-09-11 02:57:38 -0700 (Tue, 11 Sep 2012)
Log Message
[QT] Fix build with newer qmake from Qt 5
Rubber-stamped by Tor Arne Vestbø.
Support for "qmake -query QMAKE_MKSPECS" was removed from qmake. Replace
it with the use of QT_HOST_DATA/mkspecs.
Based on patch by Oswald Buddenhagen <[email protected]>.
* Scripts/webkitdirs.pm:
(builtDylibPathForName):
(qtMakeCommand):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128161 => 128162)
--- trunk/Tools/ChangeLog 2012-09-11 09:54:58 UTC (rev 128161)
+++ trunk/Tools/ChangeLog 2012-09-11 09:57:38 UTC (rev 128162)
@@ -1,3 +1,17 @@
+2012-09-11 Simon Hausmann <[email protected]>
+
+ [QT] Fix build with newer qmake from Qt 5
+
+ Rubber-stamped by Tor Arne Vestbø.
+
+ Support for "qmake -query QMAKE_MKSPECS" was removed from qmake. Replace
+ it with the use of QT_HOST_DATA/mkspecs.
+ Based on patch by Oswald Buddenhagen <[email protected]>.
+
+ * Scripts/webkitdirs.pm:
+ (builtDylibPathForName):
+ (qtMakeCommand):
+
2012-09-11 Tor Arne Vestbø <[email protected]>
[Qt] Remove Qt 4 syncqt, no longer needed
Modified: trunk/Tools/Scripts/webkitdirs.pm (128161 => 128162)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-09-11 09:54:58 UTC (rev 128161)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-09-11 09:57:38 UTC (rev 128162)
@@ -735,8 +735,8 @@
$libraryName .= "d";
}
- my $mkspec = `$qmakebin -query QMAKE_MKSPECS`;
- $mkspec =~ s/[\n|\r]$//g;
+ chomp(my $mkspec = `$qmakebin -query QT_HOST_DATA`);
+ $mkspec .= "/mkspecs";
my $qtMajorVersion = retrieveQMakespecVar("$mkspec/qconfig.pri", "QT_MAJOR_VERSION");
if (not $qtMajorVersion) {
$qtMajorVersion = "";
@@ -1872,8 +1872,8 @@
sub qtMakeCommand($)
{
my ($qmakebin) = @_;
- chomp(my $mkspec = `$qmakebin -query QMAKE_MKSPECS`);
- $mkspec .= "/default";
+ chomp(my $mkspec = `$qmakebin -query QT_HOST_DATA`);
+ $mkspec .= "/mkspecs/default";
my $compiler = retrieveQMakespecVar("$mkspec/qmake.conf", "QMAKE_CC");
#print "default spec: " . $mkspec . "\n";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
