Merge branch 'power_save'

Conflicts:
	src/engine/engine.cpp

diff --cc src/engine/engine.cpp
index 778867f,f5358c8..c0fd719
--- 1/src/engine/engine.cpp
--- 2/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@@ -496,11 -479,8 +506,8 @@@ void SituareEngine::signalsFromGPS(
      connect(m_gps, SIGNAL(timeout()),
              m_ui, SLOT(gpsTimeout()));
  
 -    connect(m_gps, SIGNAL(error(int)),
 -            this, SLOT(error(int)));
 +    connect(m_gps, SIGNAL(error(int, int)),
 +            this, SLOT(error(int, int)));
- 
-     connect(m_gps, SIGNAL(position(QPointF,qreal)),
-             this, SLOT(saveGPSPosition(QPointF)));
  }
  
  void SituareEngine::signalsFromMainWindow()

diff --cc src/engine/engine.h
Simple merge

diff --cc src/gps/gpsposition.h
Simple merge

diff --cc src/gps/gpspositionprivate.cpp
Simple merge

diff --cc src/gps/gpspositionprivateliblocation.cpp
Simple merge

diff --cc src/gps/gpspositionprivatestub.cpp
Simple merge