From 2a621049ed1663cc7d9725ec331eac621c9562a3 Mon Sep 17 00:00:00 2001 From: "vestbo@webkit.org" Date: Wed, 27 Jun 2012 13:05:43 +0000 Subject: [PATCH] [Qt] Fix lookup location for sqlite sources MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Don't look in the install dir - we are unlikely to find anything there unless we are doing a developer build. Patch by Oswald Buddenhagen on 2012-06-27 Reviewed by Tor Arne Vestbø. * qmake/mkspecs/features/features.prf: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121339 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 11 +++++++++++ Tools/qmake/mkspecs/features/features.prf | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index d777ee3..a0b4be7 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,14 @@ +2012-06-27 Oswald Buddenhagen + + [Qt] Fix lookup location for sqlite sources + + Don't look in the install dir - we are unlikely to find anything there + unless we are doing a developer build. + + Reviewed by Tor Arne Vestbø. + + * qmake/mkspecs/features/features.prf: + 2012-06-27 Zan Dobersek [Gtk] Add support for the Gamepad API diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 29d41f0..813825b 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -23,7 +23,7 @@ load(mobilityconfig, true) # Try to locate sqlite3 source SQLITE3SRCDIR = $$(SQLITE3SRCDIR) isEmpty(SQLITE3SRCDIR) { - SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ + SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/ } # ---------- Dynamically detect optional features ------------- -- 2.7.4