diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 08:28:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 08:28:42 (GMT) |
| commit | 953e91c582cd396082250748e4c4d8424292c1de (patch) | |
| tree | e7e11a957e7e63c2e14bd19452080d58177733ff | |
| parent | 7b10151cb6550fe8060217fad8549950eadd5fca (diff) | |
| parent | c4394ce84edbfc41869a77bb3e73a90915cc9df3 (diff) | |
| download | Qt-953e91c582cd396082250748e4c4d8424292c1de.zip Qt-953e91c582cd396082250748e4c4d8424292c1de.tar.gz Qt-953e91c582cd396082250748e4c4d8424292c1de.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Revert "Fixed a parsing error during sis and runonphone target creation."
| -rw-r--r-- | mkspecs/features/sis_targets.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/run_on_phone.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index f7e633c..99f5910 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -4,7 +4,7 @@ GENERATE_SIS_TARGETS = false contains(TEMPLATE, app): GENERATE_SIS_TARGETS = true else:!equals(DEPLOYMENT, default_deployment) { for(dep_item, $$list($$DEPLOYMENT)) { - eval(dep_item_sources = $${dep_item}.sources) + dep_item_sources = $$eval($${dep_item}.sources) !isEmpty(dep_item_sources): GENERATE_SIS_TARGETS = true } } diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf index 6fd400a..818151a 100644 --- a/mkspecs/features/symbian/run_on_phone.prf +++ b/mkspecs/features/symbian/run_on_phone.prf @@ -5,7 +5,7 @@ GENERATE_RUN_TARGETS = false contains(TEMPLATE, app): GENERATE_RUN_TARGETS = true else:!equals(DEPLOYMENT, default_deployment) { for(dep_item, $$list($$DEPLOYMENT)) { - eval(dep_item_sources = $${dep_item}.sources) + dep_item_sources = $$eval($${dep_item}.sources) !isEmpty(dep_item_sources): GENERATE_RUN_TARGETS = true } } |