diff options
| author | David Laing <david.laing@nokia.com> | 2010-07-04 14:47:22 +1000 |
|---|---|---|
| committer | David Laing <david.laing@nokia.com> | 2010-07-04 14:47:22 +1000 |
| commit | e38ebf00c0b539a7756b21946693e201269b976a (patch) | |
| tree | 8f90c28f7e57095b9bd8749d17a6a36e9a297dcd /qtmobility.pro | |
| parent | 448d4a4301b7abeb9065aca13b62c70422239b94 (diff) | |
Revert "Merge branch 'master' of ../../mainline/qtmobility"
This reverts commit 448d4a4301b7abeb9065aca13b62c70422239b94, reversing
changes made to 815d646dc485b6d15fbddc2814201a5b50be4a85.
Diffstat (limited to 'qtmobility.pro')
| -rw-r--r-- | qtmobility.pro | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/qtmobility.pro b/qtmobility.pro index 8050d78f35..135ed85f28 100644 --- a/qtmobility.pro +++ b/qtmobility.pro @@ -89,7 +89,6 @@ contains(build_docs, yes) { contains(build_unit_tests, yes):SUBDIRS+=tests contains(build_examples, yes):SUBDIRS+=examples -contains(build_docs, yes):SUBDIRS+=demos #updating and deployment of translations requires Qt 4.6.3/qtPrepareTool !symbian:defined(qtPrepareTool):SUBDIRS += translations @@ -156,12 +155,6 @@ contains(build_docs, yes):SUBDIRS+=demos qtmheaderssensors.files = $${QT_MOBILITY_BUILD_TREE}/include/QtSensors/* INSTALLS += qtmheaderssensors } - - contains(mobility_modules,organizer) { - qtmheadersorganizer.path = $${QT_MOBILITY_INCLUDE}/QtOrganizer - qtmheadersorganizer.files = $${QT_MOBILITY_BUILD_TREE}/include/QtOrganizer/* - INSTALLS += qtmheadersorganizer - } } else { #absolute path does not work and #include <QtMyLibrary/class.h> style does not work either @@ -175,8 +168,7 @@ contains(build_docs, yes):SUBDIRS+=demos include/QtPublishSubscribe/* \ include/QtServiceFramework/* \ include/QtSystemInfo/* \ - include/QtSensors/* \ - include/QtOrganizer/* + include/QtSensors/* contains(mobility_modules,contacts|versit) { for(api, qtmAppHeaders) { @@ -190,7 +182,7 @@ contains(build_docs, yes):SUBDIRS+=demos } } - contains(mobility_modules,serviceframework|location|bearer|publishsubscribe|systeminfo|multimedia|messaging|organizer) { + contains(mobility_modules,serviceframework|location|bearer|publishsubscribe|systeminfo|multimedia|messaging) { for(api, qtmMwHeaders) { INCLUDEFILES=$$files($$api); #files() attaches a ';' at the end which we need to remove |