summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-09-22 16:26:04 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-23 08:48:52 +0200
commit423d8d9af789778483850c45e72d36f79b30a915 (patch)
treed35fad4ae091764ca389b23a7249f049d590ba4f
parenteeab4de108796b5c86a1a881879114c1bc13424a (diff)
Re-enable qtlocation by default.
Change-Id: Ib4e96ebc014d5f8651ab16184955645fbba16458 Reviewed-on: http://codereview.qt-project.org/5355 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
-rw-r--r--qt.pro2
1 files changed, 0 insertions, 2 deletions
diff --git a/qt.pro b/qt.pro
index 02439ce9..ade52b51 100644
--- a/qt.pro
+++ b/qt.pro
@@ -64,8 +64,6 @@ module_qtqa.depends = module_qtbase
module_qtlocation.subdir = $$IN_PWD/qtlocation
module_qtlocation.target = module-qtlocation
module_qtlocation.depends = module_qtbase module_qtdeclarative module_qtquick3d module_qtscript
-# temporarily disabled to resolve deadlock as commented on http://codereview.qt-project.org/5337
-module_qtlocation.CONFIG = no_default_target no_default_install
module_qtsensors.subdir = $$IN_PWD/qtsensors
module_qtsensors.target = module-qtsensors