diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-19 16:14:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-19 16:37:01 +0200 |
| commit | 1fa46a4cc7180185de26e2634f0e7d15728c146f (patch) | |
| tree | fc6b14d840e3082b2081efc5e8aa3ea1c99f38e4 | |
| parent | 314a68bfbacb390fa7531d17fdc5a9a5f96abab6 (diff) | |
| download | qtlocation-1fa46a4cc7180185de26e2634f0e7d15728c146f.tar.gz | |
fix build
QT_BUILD_TREE is a no-no
Change-Id: Icbf3bb5d0776d5db1859c2a2d8d89621c6cc34bd
Reviewed-on: http://codereview.qt.nokia.com/1834
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| -rw-r--r-- | src/3rdparty/proj.pri | 4 | ||||
| -rw-r--r-- | src/3rdparty/proj.pro | 1 | ||||
| -rw-r--r-- | src/location/location.pro | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/3rdparty/proj.pri b/src/3rdparty/proj.pri index 553e4758..b954a9ad 100644 --- a/src/3rdparty/proj.pri +++ b/src/3rdparty/proj.pri @@ -5,7 +5,3 @@ DEFINES += DISABLE_CVSID symbian { LIBS += -llibpthread -llibm } - -!contains(BUILD_PROJ, true) { - LIBS += -L$$QT_BUILD_TREE/../qtlocation/src/3rdparty -lproj -} diff --git a/src/3rdparty/proj.pro b/src/3rdparty/proj.pro index bd2ad315..beee478d 100644 --- a/src/3rdparty/proj.pro +++ b/src/3rdparty/proj.pro @@ -1,7 +1,6 @@ TEMPLATE=lib CONFIG+=static -BUILD_PROJ=true include(proj.pri) CONFIG += warn_off diff --git a/src/location/location.pro b/src/location/location.pro index db7749e9..05c4eb38 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 += \ |