diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-08-31 15:25:05 +1000 |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-08-31 15:25:05 +1000 |
| commit | 824c84ae40b128687a77daebd2225cc2fd615d98 (patch) | |
| tree | 8f7cbf2bb8f443cb421eba40ba2812be1e93065c /src/location/location.pro | |
| parent | 1bea0e3ef13757c775ca00efdba5f4f22233c788 (diff) | |
| parent | 6cd54ea696b87c01a16b7fcaba6405f62882370a (diff) | |
| download | qtlocation-824c84ae40b128687a77daebd2225cc2fd615d98.tar.gz | |
Merge remote branch 'origin/master' into places
Conflicts:
examples/declarative/flickr/qmllocationflickr.cpp
examples/declarative/landmarkmap/landmarkmap.pro
examples/declarative/landmarkmap/qmllandmarkmap.cpp
examples/declarative/mapviewer/Dialog.qml
examples/declarative/mapviewer/MapComponent.qml
examples/declarative/mapviewer/Marker.qml
examples/declarative/mapviewer/Message.qml
examples/declarative/mapviewer/RouteDialog.qml
examples/declarative/mapviewer/TextWithLabel.qml
examples/declarative/mapviewer/common/Button.qml
examples/declarative/mapviewer/common/Fader.qml
examples/declarative/mapviewer/common/Menu.qml
examples/declarative/mapviewer/common/Slider.qml
examples/declarative/mapviewer/common/TitleBar.qml
examples/declarative/mapviewer/mapviewer.qml
examples/declarative/mapviewer/qmlmapviewer.cpp
src/imports/location/qdeclarativegeocodemodel.cpp
src/imports/location/qdeclarativegeomapmousearea_p.h
src/imports/location/qdeclarativegeomapobject_p.h
src/imports/location/qdeclarativegeoserviceprovider.cpp
src/imports/location/qdeclarativegeoserviceprovider_p.h
src/imports/location/qdeclarativegraphicsgeomap.cpp
src/imports/location/qdeclarativegraphicsgeomap_p.h
Change-Id: Ic4643a2eabe1d8d4312856422cc0dbe8082c0f16
Diffstat (limited to 'src/location/location.pro')
| -rw-r--r-- | src/location/location.pro | 1 |
1 files changed, 1 insertions, 0 deletions
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 += \ |