equal
deleted
inserted
replaced
83 <unit bldFile="drm_pub/drm_license_checker_api/group"/> |
83 <unit bldFile="drm_pub/drm_license_checker_api/group"/> |
84 </component> |
84 </component> |
85 </collection> |
85 </collection> |
86 <collection id="commondrm" name="Common DRM" level="generic"> |
86 <collection id="commondrm" name="Common DRM" level="generic"> |
87 <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf --> |
87 <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf --> |
|
88 <!-- |
88 <component id="drmqtencryptor" filter="s60" name="DRM Qt Encryptor" introduced="^4"> |
89 <component id="drmqtencryptor" filter="s60" name="DRM Qt Encryptor" introduced="^4"> |
89 <unit bldFile="commondrm/drmqtencryptor" qt:proFile="qt_drmencryptor.pro" /> |
90 <unit bldFile="commondrm/drmqtencryptor" qt:proFile="qt_drmencryptor.pro" /> |
90 </component> |
91 </component> |
91 <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI"> |
92 <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI"> |
92 <unit bldFile="commondrm/drmrightsmanagerui/help/group"/> |
93 <unit bldFile="commondrm/drmrightsmanagerui/help/group"/> |
98 <unit bldFile="commondrm/drmserviceapiwrapper/group"/> |
99 <unit bldFile="commondrm/drmserviceapiwrapper/group"/> |
99 </component> |
100 </component> |
100 <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location"> |
101 <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location"> |
101 <unit bldFile="commondrm/drmrightsstoringlocation/group"/> |
102 <unit bldFile="commondrm/drmrightsstoringlocation/group"/> |
102 </component> |
103 </component> |
|
104 --> |
103 <component id="commondrm_build" filter="s60" name="Common DRM Build"> |
105 <component id="commondrm_build" filter="s60" name="Common DRM Build"> |
104 <!-- should be split into the above files, or them collapsed into a single component --> |
106 <!-- should be split into the above files, or them collapsed into a single component --> |
105 <unit bldFile="commondrm/group"/> |
107 <unit bldFile="commondrm/group"/> |
106 </component> |
108 </component> |
107 <component id="commondrm_qt_build" filter="s60" name="Common DRM Qt Build" introduced="^4"> |
109 <component id="commondrm_qt_build" filter="s60" name="Common DRM Qt Build" introduced="^4"> |