Title: [121346] trunk/Tools
- Revision
- 121346
- Author
- o...@webkit.org
- Date
- 2012-06-27 09:55:51 -0700 (Wed, 27 Jun 2012)
Log Message
[Qt] REGRESSION(r121339): It broke the build on the Qt Windows bots
https://bugs.webkit.org/show_bug.cgi?id=90081
Buildfix for Qt 4.8 Windows. Use the former path for Qt 4.8, and the newer one for Qt 5.
Reviewed by Noam Rosenthal.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121345 => 121346)
--- trunk/Tools/ChangeLog 2012-06-27 15:52:00 UTC (rev 121345)
+++ trunk/Tools/ChangeLog 2012-06-27 16:55:51 UTC (rev 121346)
@@ -1,3 +1,14 @@
+2012-06-27 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt] REGRESSION(r121339): It broke the build on the Qt Windows bots
+ https://bugs.webkit.org/show_bug.cgi?id=90081
+
+ Buildfix for Qt 4.8 Windows. Use the former path for Qt 4.8, and the newer one for Qt 5.
+
+ Reviewed by Noam Rosenthal.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-06-27 Sergio Villar Senin <svil...@igalia.com>
[WK2] [GTK] WebKit2 testing bot fails to run tests due to missing files
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (121345 => 121346)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-27 15:52:00 UTC (rev 121345)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-27 16:55:51 UTC (rev 121346)
@@ -23,7 +23,8 @@
# Try to locate sqlite3 source
SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
isEmpty(SQLITE3SRCDIR) {
- SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
+ haveQt(5):SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
+ else:SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
}
# ---------- Dynamically detect optional features -------------
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
