diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-01-28 16:49:33 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-01-31 11:51:46 +1000 |
| commit | 31e1e2eaf6194c99b5a7a00691798907a89dd750 (patch) | |
| tree | fb0d57c1599530685990c585a3107a4599afeba6 /features | |
| parent | e933139b17db8da0c1dbcab98176831ac1315cf7 (diff) | |
Avoid accidental usage of system libraries.
While building Mobility, we were adding the Mobility lib install path to
the link path. That's wrong, since we haven't installed Mobility yet.
On most platforms, this has not caused problems.
On Harmattan, it is quite likely that there is already some Mobility
libraries installed, which means that we would incorrectly link against
those instead of the ones we're building.
Reviewed-by: Alex
Diffstat (limited to 'features')
| -rw-r--r-- | features/basic_examples_setup.pri | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/features/basic_examples_setup.pri b/features/basic_examples_setup.pri index f3a959e283..963d6966e3 100644 --- a/features/basic_examples_setup.pri +++ b/features/basic_examples_setup.pri @@ -34,8 +34,14 @@ MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET -mac:LIBS+= -F$$OUTPUT_DIR/lib -LIBS+= -L$$OUTPUT_DIR/lib + +# See common.pri for comments on why using QMAKE_FRAMEWORKPATH/QMAKE_LIBDIR +# rather than LIBS here. +mac:contains(QT_CONFIG,qt_framework) { + QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib +} +QMAKE_LIBDIR = $$OUTPUT_DIR/lib + QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global |