diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-06-07 10:42:49 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-06-07 10:42:49 +0200 |
| commit | 54ab65e63ce7ea3705f3a18cffde008199c27c6f (patch) | |
| tree | 73fe4795aa175a857d9df2e9fe98d432cdc2f20d /common.pri | |
| parent | 3ef861c0fa96900fb75171a022e0325160da4a16 (diff) | |
| parent | 507933aad055e53e16980541bb90a91e6c70012c (diff) | |
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0
Conflicts:
src/global/qmobilityglobal.h
src/serviceframework/databasemanager.cpp
Diffstat (limited to 'common.pri')
| -rw-r--r-- | common.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common.pri b/common.pri index 9519dd9fbb..e1cd9bc430 100644 --- a/common.pri +++ b/common.pri @@ -88,6 +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 } else { DESTDIR = $$OUTPUT_DIR/bin } @@ -161,6 +162,9 @@ wince* { symbian { #For some reason the default include path doesn't include MOC_DIR on symbian INCLUDEPATH += $$MOC_DIR + + #This is supposed to be defined in symbian_os.hrh + #DEFINES += SYMBIAN_EMULATOR_SUPPORTS_PERPROCESS_WSD } # Add the output dirs to the link path too |