Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-location into 1.1-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 10 Mar 2011 14:31:29 +0000 (00:31 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 10 Mar 2011 14:31:29 +0000 (00:31 +1000)
commit93a3f700ca172d4ea5d3c7ddd34bd833298321f0
tree63189b4ec410f74ab08effb87659d06336bde659
parentb95b2f896a7c58f519b26a42321a64d5c889a511
parente602f6437a7d0c0eb6663b47696c1dda786d4404
Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-location into 1.1-integration

* '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-location:
  Create define so that MOBILITY-2664 can be easily reproduced
  Don't preserve existing landmarks for tests(unless define is used)
  linking problem with VS2008 for qlandmarkmanagerplugins autotest