12 files changed, 178 insertions, 164 deletions
diff --git a/src/3rdparty/proj.pri b/src/3rdparty/proj.pri
index e075a68e..b954a9ad 100644
--- a/src/3rdparty/proj.pri
+++ b/src/3rdparty/proj.pri
@@ -1,158 +1,7 @@
 INCLUDEPATH += $$PWD/proj/include
 
-SOURCES += $$PWD/proj/PJ_aeqd.c \
-        $$PWD/proj/PJ_gnom.c \
-        $$PWD/proj/PJ_laea.c \
-        $$PWD/proj/PJ_mod_ster.c \
-        $$PWD/proj/PJ_nsper.c \
-        $$PWD/proj/PJ_nzmg.c \
-        $$PWD/proj/PJ_ortho.c \
-        $$PWD/proj/PJ_stere.c \
-        $$PWD/proj/PJ_sterea.c \
-        $$PWD/proj/PJ_aea.c \
-        $$PWD/proj/PJ_bipc.c \
-        $$PWD/proj/PJ_bonne.c \
-        $$PWD/proj/PJ_eqdc.c \
-        $$PWD/proj/PJ_imw_p.c \
-        $$PWD/proj/PJ_krovak.c \
-        $$PWD/proj/PJ_lcc.c \
-        $$PWD/proj/PJ_poly.c \
-        $$PWD/proj/PJ_rpoly.c \
-        $$PWD/proj/PJ_sconics.c \
-        $$PWD/proj/proj_rouss.c \
-        $$PWD/proj/PJ_cass.c \
-        $$PWD/proj/PJ_cc.c \
-        $$PWD/proj/PJ_cea.c \
-        $$PWD/proj/PJ_eqc.c \
-        $$PWD/proj/PJ_gall.c \
-        $$PWD/proj/PJ_labrd.c \
-        $$PWD/proj/PJ_lsat.c \
-        $$PWD/proj/PJ_merc.c \
-        $$PWD/proj/PJ_mill.c \
-        $$PWD/proj/PJ_ocea.c \
-        $$PWD/proj/PJ_omerc.c \
-        $$PWD/proj/PJ_somerc.c \
-        $$PWD/proj/PJ_tcc.c \
-        $$PWD/proj/PJ_tcea.c \
-        $$PWD/proj/PJ_tmerc.c \
-        $$PWD/proj/PJ_airy.c \
-        $$PWD/proj/PJ_aitoff.c \
-        $$PWD/proj/PJ_august.c \
-        $$PWD/proj/PJ_bacon.c \
-        $$PWD/proj/PJ_chamb.c \
-        $$PWD/proj/PJ_hammer.c \
-        $$PWD/proj/PJ_lagrng.c \
-        $$PWD/proj/PJ_larr.c \
-        $$PWD/proj/PJ_lask.c \
-        $$PWD/proj/PJ_nocol.c \
-        $$PWD/proj/PJ_ob_tran.c \
-        $$PWD/proj/PJ_oea.c \
-        $$PWD/proj/PJ_tpeqd.c \
-        $$PWD/proj/PJ_vandg.c \
-        $$PWD/proj/PJ_vandg2.c \
-        $$PWD/proj/PJ_vandg4.c \
-        $$PWD/proj/PJ_wag7.c \
-        $$PWD/proj/PJ_lcca.c \
-        $$PWD/proj/PJ_geos.c \
-        $$PWD/proj/PJ_boggs.c \
-        $$PWD/proj/PJ_collg.c \
-        $$PWD/proj/PJ_crast.c \
-        $$PWD/proj/PJ_denoy.c \
-        $$PWD/proj/PJ_eck1.c \
-        $$PWD/proj/PJ_eck2.c \
-        $$PWD/proj/PJ_eck3.c \
-        $$PWD/proj/PJ_eck4.c \
-        $$PWD/proj/PJ_eck5.c \
-        $$PWD/proj/PJ_fahey.c \
-        $$PWD/proj/PJ_fouc_s.c \
-        $$PWD/proj/PJ_gins8.c \
-        $$PWD/proj/PJ_gstmerc.c \
-        $$PWD/proj/PJ_gn_sinu.c \
-        $$PWD/proj/PJ_goode.c \
-        $$PWD/proj/PJ_hatano.c \
-        $$PWD/proj/PJ_loxim.c \
-        $$PWD/proj/PJ_mbt_fps.c \
-        $$PWD/proj/PJ_mbtfpp.c \
-        $$PWD/proj/PJ_mbtfpq.c \
-        $$PWD/proj/PJ_moll.c \
-        $$PWD/proj/PJ_nell.c \
-        $$PWD/proj/PJ_nell_h.c \
-        $$PWD/proj/PJ_putp2.c \
-        $$PWD/proj/PJ_putp3.c \
-        $$PWD/proj/PJ_putp4p.c \
-        $$PWD/proj/PJ_putp5.c \
-        $$PWD/proj/PJ_putp6.c \
-        $$PWD/proj/PJ_robin.c \
-        $$PWD/proj/PJ_sts.c \
-        $$PWD/proj/PJ_urm5.c \
-        $$PWD/proj/PJ_urmfps.c \
-        $$PWD/proj/PJ_wag2.c \
-        $$PWD/proj/PJ_wag3.c \
-        $$PWD/proj/PJ_wink1.c \
-        $$PWD/proj/PJ_wink2.c \
-        $$PWD/proj/pj_latlong.c \
-        $$PWD/proj/pj_geocent.c \
-        $$PWD/proj/aasincos.c \
-        $$PWD/proj/adjlon.c \
-        $$PWD/proj/bch2bps.c \
-        $$PWD/proj/bchgen.c \
-        $$PWD/proj/biveval.c \
-        $$PWD/proj/dmstor.c \
-        $$PWD/proj/mk_cheby.c \
-        $$PWD/proj/pj_auth.c \
-        $$PWD/proj/pj_deriv.c \
-        $$PWD/proj/pj_ell_set.c \
-        $$PWD/proj/pj_ellps.c \
-        $$PWD/proj/pj_errno.c \
-        $$PWD/proj/pj_factors.c \
-        $$PWD/proj/pj_fwd.c \
-        $$PWD/proj/pj_init.c \
-        $$PWD/proj/pj_inv.c \
-        $$PWD/proj/pj_list.c \
-        $$PWD/proj/pj_malloc.c \
-        $$PWD/proj/pj_mlfn.c \
-        $$PWD/proj/pj_msfn.c \
-        $$PWD/proj/proj_mdist.c \
-        $$PWD/proj/pj_open_lib_qt.cpp \
-	$$PWD/proj/pj_param.c \
-        $$PWD/proj/pj_phi2.c \
-        $$PWD/proj/pj_pr_list.c \
-        $$PWD/proj/pj_qsfn.c \
-        $$PWD/proj/pj_strerrno.c \
-        $$PWD/proj/pj_tsfn.c \
-        $$PWD/proj/pj_units.c \
-        $$PWD/proj/pj_zpoly1.c \
-        $$PWD/proj/rtodms.c \
-        $$PWD/proj/vector1.c \
-        $$PWD/proj/pj_release.c \
-        $$PWD/proj/pj_gauss.c \
-        $$PWD/proj/nad_cvt.c \
-        $$PWD/proj/nad_init.c \
-        $$PWD/proj/nad_intr.c \
-        $$PWD/proj/emess.c \
-        $$PWD/proj/pj_apply_gridshift.c \
-        $$PWD/proj/pj_datums.c \
-        $$PWD/proj/pj_datum_set.c \
-        $$PWD/proj/pj_transform.c \
-        $$PWD/proj/geocent.c \
-        $$PWD/proj/pj_utils.c \
-        $$PWD/proj/pj_gridinfo.c \
-        $$PWD/proj/pj_gridlist.c \
-        $$PWD/proj/pj_mutex.c \
-        $$PWD/proj/pj_initcache.c
-
 DEFINES += DISABLE_CVSID
 
-unix {
-  DEFINES += MUTEX_pthread
-}
-
 symbian {
   LIBS += -llibpthread -llibm
 }
-
-win32 {
-  DEFINES += MUTEX_win32
-}
-
-RESOURCES += $$PWD/proj/data.qrc
diff --git a/src/3rdparty/proj.pro b/src/3rdparty/proj.pro
new file mode 100644
index 00000000..beee478d
--- /dev/null
+++ b/src/3rdparty/proj.pro
@@ -0,0 +1,158 @@
+TEMPLATE=lib
+CONFIG+=static
+
+include(proj.pri)
+
+CONFIG += warn_off
+
+SOURCES += \
+        $$PWD/proj/PJ_aeqd.c \
+        $$PWD/proj/PJ_gnom.c \
+        $$PWD/proj/PJ_laea.c \
+        $$PWD/proj/PJ_mod_ster.c \
+        $$PWD/proj/PJ_nsper.c \
+        $$PWD/proj/PJ_nzmg.c \
+        $$PWD/proj/PJ_ortho.c \
+        $$PWD/proj/PJ_stere.c \
+        $$PWD/proj/PJ_sterea.c \
+        $$PWD/proj/PJ_aea.c \
+        $$PWD/proj/PJ_bipc.c \
+        $$PWD/proj/PJ_bonne.c \
+        $$PWD/proj/PJ_eqdc.c \
+        $$PWD/proj/PJ_imw_p.c \
+        $$PWD/proj/PJ_krovak.c \
+        $$PWD/proj/PJ_lcc.c \
+        $$PWD/proj/PJ_poly.c \
+        $$PWD/proj/PJ_rpoly.c \
+        $$PWD/proj/PJ_sconics.c \
+        $$PWD/proj/proj_rouss.c \
+        $$PWD/proj/PJ_cass.c \
+        $$PWD/proj/PJ_cc.c \
+        $$PWD/proj/PJ_cea.c \
+        $$PWD/proj/PJ_eqc.c \
+        $$PWD/proj/PJ_gall.c \
+        $$PWD/proj/PJ_labrd.c \
+        $$PWD/proj/PJ_lsat.c \
+        $$PWD/proj/PJ_merc.c \
+        $$PWD/proj/PJ_mill.c \
+        $$PWD/proj/PJ_ocea.c \
+        $$PWD/proj/PJ_omerc.c \
+        $$PWD/proj/PJ_somerc.c \
+        $$PWD/proj/PJ_tcc.c \
+        $$PWD/proj/PJ_tcea.c \
+        $$PWD/proj/PJ_tmerc.c \
+        $$PWD/proj/PJ_airy.c \
+        $$PWD/proj/PJ_aitoff.c \
+        $$PWD/proj/PJ_august.c \
+        $$PWD/proj/PJ_bacon.c \
+        $$PWD/proj/PJ_chamb.c \
+        $$PWD/proj/PJ_hammer.c \
+        $$PWD/proj/PJ_lagrng.c \
+        $$PWD/proj/PJ_larr.c \
+        $$PWD/proj/PJ_lask.c \
+        $$PWD/proj/PJ_nocol.c \
+        $$PWD/proj/PJ_ob_tran.c \
+        $$PWD/proj/PJ_oea.c \
+        $$PWD/proj/PJ_tpeqd.c \
+        $$PWD/proj/PJ_vandg.c \
+        $$PWD/proj/PJ_vandg2.c \
+        $$PWD/proj/PJ_vandg4.c \
+        $$PWD/proj/PJ_wag7.c \
+        $$PWD/proj/PJ_lcca.c \
+        $$PWD/proj/PJ_geos.c \
+        $$PWD/proj/PJ_boggs.c \
+        $$PWD/proj/PJ_collg.c \
+        $$PWD/proj/PJ_crast.c \
+        $$PWD/proj/PJ_denoy.c \
+        $$PWD/proj/PJ_eck1.c \
+        $$PWD/proj/PJ_eck2.c \
+        $$PWD/proj/PJ_eck3.c \
+        $$PWD/proj/PJ_eck4.c \
+        $$PWD/proj/PJ_eck5.c \
+        $$PWD/proj/PJ_fahey.c \
+        $$PWD/proj/PJ_fouc_s.c \
+        $$PWD/proj/PJ_gins8.c \
+        $$PWD/proj/PJ_gstmerc.c \
+        $$PWD/proj/PJ_gn_sinu.c \
+        $$PWD/proj/PJ_goode.c \
+        $$PWD/proj/PJ_hatano.c \
+        $$PWD/proj/PJ_loxim.c \
+        $$PWD/proj/PJ_mbt_fps.c \
+        $$PWD/proj/PJ_mbtfpp.c \
+        $$PWD/proj/PJ_mbtfpq.c \
+        $$PWD/proj/PJ_moll.c \
+        $$PWD/proj/PJ_nell.c \
+        $$PWD/proj/PJ_nell_h.c \
+        $$PWD/proj/PJ_putp2.c \
+        $$PWD/proj/PJ_putp3.c \
+        $$PWD/proj/PJ_putp4p.c \
+        $$PWD/proj/PJ_putp5.c \
+        $$PWD/proj/PJ_putp6.c \
+        $$PWD/proj/PJ_robin.c \
+        $$PWD/proj/PJ_sts.c \
+        $$PWD/proj/PJ_urm5.c \
+        $$PWD/proj/PJ_urmfps.c \
+        $$PWD/proj/PJ_wag2.c \
+        $$PWD/proj/PJ_wag3.c \
+        $$PWD/proj/PJ_wink1.c \
+        $$PWD/proj/PJ_wink2.c \
+        $$PWD/proj/pj_latlong.c \
+        $$PWD/proj/pj_geocent.c \
+        $$PWD/proj/aasincos.c \
+        $$PWD/proj/adjlon.c \
+        $$PWD/proj/bch2bps.c \
+        $$PWD/proj/bchgen.c \
+        $$PWD/proj/biveval.c \
+        $$PWD/proj/dmstor.c \
+        $$PWD/proj/mk_cheby.c \
+        $$PWD/proj/pj_auth.c \
+        $$PWD/proj/pj_deriv.c \
+        $$PWD/proj/pj_ell_set.c \
+        $$PWD/proj/pj_ellps.c \
+        $$PWD/proj/pj_errno.c \
+        $$PWD/proj/pj_factors.c \
+        $$PWD/proj/pj_fwd.c \
+        $$PWD/proj/pj_init.c \
+        $$PWD/proj/pj_inv.c \
+        $$PWD/proj/pj_list.c \
+        $$PWD/proj/pj_malloc.c \
+        $$PWD/proj/pj_mlfn.c \
+        $$PWD/proj/pj_msfn.c \
+        $$PWD/proj/proj_mdist.c \
+        $$PWD/proj/pj_open_lib_qt.cpp \
+        $$PWD/proj/pj_param.c \
+        $$PWD/proj/pj_phi2.c \
+        $$PWD/proj/pj_pr_list.c \
+        $$PWD/proj/pj_qsfn.c \
+        $$PWD/proj/pj_strerrno.c \
+        $$PWD/proj/pj_tsfn.c \
+        $$PWD/proj/pj_units.c \
+        $$PWD/proj/pj_zpoly1.c \
+        $$PWD/proj/rtodms.c \
+        $$PWD/proj/vector1.c \
+        $$PWD/proj/pj_release.c \
+        $$PWD/proj/pj_gauss.c \
+        $$PWD/proj/nad_cvt.c \
+        $$PWD/proj/nad_init.c \
+        $$PWD/proj/nad_intr.c \
+        $$PWD/proj/emess.c \
+        $$PWD/proj/pj_apply_gridshift.c \
+        $$PWD/proj/pj_datums.c \
+        $$PWD/proj/pj_datum_set.c \
+        $$PWD/proj/pj_transform.c \
+        $$PWD/proj/geocent.c \
+        $$PWD/proj/pj_utils.c \
+        $$PWD/proj/pj_gridinfo.c \
+        $$PWD/proj/pj_gridlist.c \
+        $$PWD/proj/pj_mutex.c \
+        $$PWD/proj/pj_initcache.c
+
+unix {
+  DEFINES += MUTEX_pthread
+}
+
+win32 {
+  DEFINES += MUTEX_win32
+}
+
+RESOURCES += $$PWD/proj/data.qrc
diff --git a/src/imports/location/qdeclarativegeomapobject_p.h b/src/imports/location/qdeclarativegeomapobject_p.h
index 143c4167..415c29de 100644
--- a/src/imports/location/qdeclarativegeomapobject_p.h
+++ b/src/imports/location/qdeclarativegeomapobject_p.h
@@ -115,6 +115,9 @@ private:
 class QDeclarativeGeoMapObjectView : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
+
+    Q_INTERFACES(QDeclarativeParserStatus)
+
     Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged)
     Q_PROPERTY(QDeclarativeComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
diff --git a/src/location/location.pro b/src/location/location.pro
index 0d2ffd8a..8e6d89ba 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -23,6 +23,7 @@ contains(proj_enabled, yes) {
   LIBS += -lproj
 } else {
   include($$PWD/../3rdparty/proj.pri)
+  LIBS += -L$$OUT_PWD/../3rdparty -lproj
 }
 
 PUBLIC_HEADERS += \
diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp
index fd6c8c47..362ec23f 100644
--- a/src/location/maps/qgeomappingmanagerengine.cpp
+++ b/src/location/maps/qgeomappingmanagerengine.cpp
@@ -373,7 +373,7 @@ void QGeoMappingManagerEngine::setSupportsTilting(bool supportsTilting)
 bool QGeoMappingManagerEngine::supportsCustomMapObjects() const
 {
     Q_D(const QGeoMappingManagerEngine);
-    return d_ptr->supportsCustomMapObjects;
+    return d->supportsCustomMapObjects;
 }
 
 /*!
@@ -386,7 +386,7 @@ bool QGeoMappingManagerEngine::supportsCustomMapObjects() const
 void QGeoMappingManagerEngine::setSupportsCustomMapObjects(bool supportsCustomMapObjects)
 {
     Q_D(QGeoMappingManagerEngine);
-    d_ptr->supportsCustomMapObjects = supportsCustomMapObjects;
+    d->supportsCustomMapObjects = supportsCustomMapObjects;
 }
 
 /*!
diff --git a/src/location/maps/qgeomaptextobject.cpp b/src/location/maps/qgeomaptextobject.cpp
index 68cbc154..2b9ee8cd 100644
--- a/src/location/maps/qgeomaptextobject.cpp
+++ b/src/location/maps/qgeomaptextobject.cpp
@@ -241,7 +241,6 @@ QPoint QGeoMapTextObject::offset() const
 
 void QGeoMapTextObject::setOffset(const QPoint &off)
 {
-    QPointF offset = off;
     if (d_ptr->offset != off) {
         d_ptr->offset = off;
         emit offsetChanged(off);
diff --git a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp
index 02279ade..9e5928bd 100644
--- a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp
@@ -106,7 +106,6 @@ void QGeoTiledMapPolygonObjectInfo::genPoly()
         double oy = origin.latitude() * 3600.0;
 
         double oldx = ox;
-        double oldy = oy;
 
         poly << QPointF(0,0);
         for (int i = 0; i < path.size(); ++i) {
@@ -125,7 +124,6 @@ void QGeoTiledMapPolygonObjectInfo::genPoly()
             poly << QPointF(x - ox, y - oy);
 
             oldx = x;
-            oldy = y;
         }
     }
 
diff --git a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp
index 3e76ce90..472d032b 100644
--- a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp
@@ -98,7 +98,6 @@ void QGeoTiledMapPolylineObjectInfo::genPath()
         double oy = origin.latitude() * 3600.0;
 
         double oldx = ox;
-        double oldy = oy;
 
         p.moveTo(0, 0);
         for (int i = 1; i < path.size(); ++i) {
@@ -117,7 +116,6 @@ void QGeoTiledMapPolylineObjectInfo::genPath()
             p.lineTo(x - ox, y - oy);
 
             oldx = x;
-            oldy = y;
         }
     }
 
diff --git a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp
index e6ae4553..4b14647f 100644
--- a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp
@@ -111,7 +111,6 @@ void QGeoTiledMapRouteObjectInfo::regenPath()
 
     if (path.size() > 0) {
         double oldx = 0.0;
-        double oldy = 0.0;
 
         for (int i = 0; i < path.size(); ++i) {
             double x = path.at(i).longitude() * 3600.0;
@@ -131,7 +130,6 @@ void QGeoTiledMapRouteObjectInfo::regenPath()
             }
 
             oldx = x;
-            oldy = y;
         }
     }
 
diff --git a/src/location/qlocationutils.cpp b/src/location/qlocationutils.cpp
index c210ed59..ed879628 100644
--- a/src/location/qlocationutils.cpp
+++ b/src/location/qlocationutils.cpp
@@ -133,7 +133,7 @@ static void qlocationutils_readRmc(const char *data, int size, QGeoPositionInfo
         *hasFix = (parts[2][0] == 'A');
 
     if (parts.count() > 9 && parts[9].count() == 6) {
-        date = QDate::fromString(parts[9], QLatin1String("ddMMyy"));
+        date = QDate::fromString(QString::fromLatin1(parts[9]), QLatin1String("ddMMyy"));
         if (date.isValid())
             date = date.addYears(100);     // otherwise starts from 1900
         else
@@ -305,9 +305,11 @@ bool QLocationUtils::getNmeaTime(const QByteArray &bytes, QTime *time)
     QTime tempTime;
 
     if (dotIndex < 0) {
-        tempTime = QTime::fromString(bytes, QLatin1String("hhmmss"));
+        tempTime = QTime::fromString(QString::fromLatin1(bytes.constData()),
+                                     QLatin1String("hhmmss"));
     } else {
-        tempTime = QTime::fromString(bytes.mid(0, dotIndex), QLatin1String("hhmmss"));
+        tempTime = QTime::fromString(QString::fromLatin1(bytes.mid(0, dotIndex)),
+                                     QLatin1String("hhmmss"));
         bool hasMsecs = false;
         int midLen = qMin(3, bytes.size() - dotIndex - 1);
         int msecs = bytes.mid(dotIndex + 1, midLen).toUInt(&hasMsecs);
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index f92e20ac..10559a66 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -336,6 +336,9 @@ QString QGeoRoutingManagerEngineNokia::modesRequestString(const QGeoRouteRequest
             case QGeoRouteRequest::DisallowFeatureWeight:
                 weightString = "-3";
                 break;
+            case QGeoRouteRequest::NeutralFeatureWeight:
+            case QGeoRouteRequest::RequireFeatureWeight:
+                break;
         }
 
         if (weightString.isEmpty())
@@ -358,6 +361,11 @@ QString QGeoRoutingManagerEngineNokia::modesRequestString(const QGeoRouteRequest
             case QGeoRouteRequest::DirtRoadFeature:
                 featureStrings.append("dirtRoad:" + weightString);
                 break;
+            case QGeoRouteRequest::PublicTransitFeature:
+            case QGeoRouteRequest::ParksFeature:
+            case QGeoRouteRequest::MotorPoolLaneFeature:
+            case QGeoRouteRequest::NoFeature:
+                break;
         }
     }
 
diff --git a/src/src.pro b/src/src.pro
index b321da3d..75e0983e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 CONFIG+=ordered
-SUBDIRS += location plugins imports
+SUBDIRS += 3rdparty/proj.pro location plugins imports