diff options
| author | Antti Luoma <antti.luoma@digia.com> | 2011-02-01 16:00:02 +0200 |
|---|---|---|
| committer | Antti Luoma <antti.luoma@digia.com> | 2011-02-01 16:00:02 +0200 |
| commit | d8adce363fb6668dc7b3bcfc6593c2cc4b5fbca5 (patch) | |
| tree | c7c0b4f8aca03cd388c81cf32fe175a1dc5ddb6e /qtmobility.pro | |
| parent | c1650f45e189c4e4ef5179f24e621f984c267dbf (diff) | |
| parent | 7f56ad048663f27a9fc090acfa71fb2d2de2a6b5 (diff) | |
Merge branch 'bluetooth-dev'
Diffstat (limited to 'qtmobility.pro')
| -rw-r--r-- | qtmobility.pro | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/qtmobility.pro b/qtmobility.pro index b7e680b8b6..416af58716 100644 --- a/qtmobility.pro +++ b/qtmobility.pro @@ -200,6 +200,12 @@ contains(build_demos, yes):SUBDIRS+=demos qtmheadersgallery.files = $${QT_MOBILITY_BUILD_TREE}/include/QtGallery/* INSTALLS += qtmheadersgallery } + + contains(mobility_modules,connectivity) { + qtmheaderconnectivity.path = $${QT_MOBILITY_INCLUDE}/QtConnectivity + qtmheaderconnectivity.files = $${QT_MOBILITY_BUILD_TREE}/include/QtConnectivity/* + INSTALLS += qtmheaderconnectivity + } } else { # following needs to be set because symbian-abld or symbian-sbsv2 is not yet # defined in platform_paths.prf and the prj_export gets confused about paths. @@ -232,7 +238,8 @@ contains(build_demos, yes):SUBDIRS+=demos include/QtSystemInfo/* \ include/QtSensors/* \ include/QtFeedback/* \ - include/QtGallery/* + include/QtGallery/* \ + include/QtConnectivity/* contains(mobility_modules,contacts|versit|organizer) { for(api, qtmAppHeaders) { @@ -252,7 +259,7 @@ contains(build_demos, yes):SUBDIRS+=demos } } - contains(mobility_modules,serviceframework|location|bearer|publishsubscribe|systeminfo|multimedia|messaging|feedback|sensors|gallery) { + contains(mobility_modules,serviceframework|location|bearer|publishsubscribe|systeminfo|multimedia|messaging|feedback|sensors|gallery|connectivity) { for(api, qtmMwHeaders) { INCLUDEFILES=$$files($$api); |