diff options
| author | David Laing <david.laing@nokia.com> | 2010-06-30 14:11:18 +1000 |
|---|---|---|
| committer | David Laing <david.laing@nokia.com> | 2010-06-30 14:11:18 +1000 |
| commit | 26bd94234dbb79a632c79e8540bb34b0da83ef7c (patch) | |
| tree | 46e55c9eb1cc879c177bf7f0e4c0e0b91d4ea5c8 /common.pri | |
| parent | d82d68d9e49ff5094a7d37dcef013fa8233b5be5 (diff) | |
| parent | 38f012dc2000507ab115db1b7137295ffa44aa84 (diff) | |
Merge branch 'master' of ../../mainline/qtmobility
Conflicts:
doc/html/classes.html
doc/html/functions.html
doc/html/qt-mobility-project-library.dcf
doc/html/qt-mobility-project-library.index
doc/html/qtmobility.qhp
plugins/plugins.pro
src/location/liblocationwrapper.cpp
Diffstat (limited to 'common.pri')
| -rw-r--r-- | common.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common.pri b/common.pri index af79e53e0f..39a4c8810b 100644 --- a/common.pri +++ b/common.pri @@ -88,7 +88,7 @@ contains(build_unit_tests, yes):DEFINES+=QTM_BUILD_UNITTESTS contains(TEMPLATE,.*lib) { DESTDIR = $$OUTPUT_DIR/lib symbian:defFilePath=../s60installs - VERSION = 1.0.1 + VERSION = 1.1.0 } else { DESTDIR = $$OUTPUT_DIR/bin } @@ -180,6 +180,7 @@ mac:contains(QT_CONFIG,qt_framework) { } LIBS += -L$$OUTPUT_DIR/lib +linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF DEPENDPATH += . $$SOURCE_DIR INCLUDEPATH += $$SOURCE_DIR/src/global |