diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-06-28 11:42:16 +1000 |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-06-28 11:42:16 +1000 |
| commit | f660a4f0dda2dd6635b320f08f1ea2048222ca53 (patch) | |
| tree | 6e859700f2ee59b0ebf29cef16ef546d06be7f11 /qtmobility.pro | |
| parent | dc08718330d02973223fc0b9f70cf6051317a794 (diff) | |
| parent | fc9766f06cb99f6fe86f393b026581d6cf6b4dfc (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility
Conflicts:
src/location/liblocationwrapper.cpp
Diffstat (limited to 'qtmobility.pro')
| -rw-r--r-- | qtmobility.pro | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/qtmobility.pro b/qtmobility.pro index 5776ad42a0..e2b9146130 100644 --- a/qtmobility.pro +++ b/qtmobility.pro @@ -151,12 +151,6 @@ contains(build_docs, yes):SUBDIRS+=demos INSTALLS += qtmheaderssysteminfo } - contains(mobility_modules,systeminfo) { - qtmheaderssysteminfo.path = $${QT_MOBILITY_INCLUDE}/QtSystemInfo - qtmheaderssysteminfo.files = $${QT_MOBILITY_BUILD_TREE}/include/QtSystemInfo/* - INSTALLS += qtmheaderssysteminfo - } - contains(mobility_modules,sensors) { qtmheaderssensors.path = $${QT_MOBILITY_INCLUDE}/QtSensors qtmheaderssensors.files = $${QT_MOBILITY_BUILD_TREE}/include/QtSensors/* |