diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-08-23 14:00:51 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-08-23 14:00:51 +1000 |
| commit | 228212b8a91326454d0e3728ca613cf67d7bc312 (patch) | |
| tree | 09b5a8b4820364628ffd3bca4be1dd528729de2b /qtmobility.pro | |
| parent | 566ec999c5b1e4f91d7e656ee412d3228b1e8294 (diff) | |
| parent | 71d93ee34f89e813686d0b04b45ae8569ff4f0df (diff) | |
Merge remote branch 'origin/master' into contacts-master
Diffstat (limited to 'qtmobility.pro')
| -rw-r--r-- | qtmobility.pro | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/qtmobility.pro b/qtmobility.pro index 51d4f7d480..41cf02df36 100644 --- a/qtmobility.pro +++ b/qtmobility.pro @@ -233,8 +233,14 @@ contains(build_demos, yes):SUBDIRS+=demos contains(mobility_modules,contacts|versit|organizer) { for(api, qtmAppHeaders) { INCLUDEFILES=$$files($$api); + #files() attaches a ';' at the end which we need to remove cleanedFiles=$$replace(INCLUDEFILES, ;,) + + #files() uses windows path separator ('\') but bld.inf requires '/' + INCLUDEFILES=$$cleanedFiles + cleanedFiles=$$replace(INCLUDEFILES, \\\,/) + for(header, cleanedFiles) { exists($$header): BLD_INF_RULES.prj_exports += "$$header $$APP_LAYER_PUBLIC_EXPORT_PATH($$basename(header))" @@ -245,8 +251,14 @@ contains(build_demos, yes):SUBDIRS+=demos contains(mobility_modules,serviceframework|location|bearer|publishsubscribe|systeminfo|multimedia|messaging|telephony|feedback|sensors|gallery) { for(api, qtmMwHeaders) { INCLUDEFILES=$$files($$api); + #files() attaches a ';' at the end which we need to remove cleanedFiles=$$replace(INCLUDEFILES, ;,) + + #files() uses windows path separator ('\') but bld.inf requires '/' + INCLUDEFILES=$$cleanedFiles + cleanedFiles=$$replace(INCLUDEFILES, \\\,/) + for(header, cleanedFiles) { exists($$header): BLD_INF_RULES.prj_exports += "$$header $$MW_LAYER_PUBLIC_EXPORT_PATH($$basename(header))" |