Merge branch 'master' into error_procedur

Conflicts:
	src/gps/gpspositionprivate.cpp
	src/gps/gpspositionprivateliblocation.cpp

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

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

diff --cc src/gps/gpspositionprivate.cpp
index 1c4ac9f,68791b8..21421c7
--- 1/src/gps/gpspositionprivate.cpp
--- 2/src/gps/gpspositionprivate.cpp
+++ b/src/gps/gpspositionprivate.cpp
@@@ -54,7 -61,8 +62,8 @@@ void GPSPositionPrivate::setMode(GPSPos
          m_gpsSource = QGeoPositionInfoSource::createDefaultSource(this);
  
          if (!m_gpsSource) {
+             m_initialized = false;
 -            emit m_parent->error(123);
 +            emit m_parent->error(SituareError::GPS_INITIALIZATION_FAILED);
              return;
          }
      }

diff --cc src/gps/gpspositionprivateliblocation.cpp
index 092c421,2590fa1..b10a898
--- 1/src/gps/gpspositionprivateliblocation.cpp
--- 2/src/gps/gpspositionprivateliblocation.cpp
+++ b/src/gps/gpspositionprivateliblocation.cpp
@@@ -56,8 -63,9 +64,9 @@@ void GPSPositionPrivate::setMode(GPSPos
      if (mode == GPSPosition::Default) {
          m_liblocationWrapper = new LiblocationWrapper(this);
  
--        if (!m_liblocationWrapper) {
++        if (!m_liblocationWrapper) {     
+             m_initialized = false;
 -            emit m_parent->error(123);  ///Change to correct error code
 +            emit m_parent->error(SituareError::GPS_INITIALIZATION_FAILED);
              return;
          }
      }

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