[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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6b201e2..4438503 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2012-06-27  Csaba Osztrogonác  <ossy@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  <svillar@igalia.com>
 
         [WK2] [GTK] WebKit2 testing bot fails to run tests due to missing files

diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 813825b..7d1f3a7 100644 (file)
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -23,7 +23,8 @@ load(mobilityconfig, true)
 # 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 -------------