diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 12:15:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 12:15:50 (GMT) |
| commit | 5010e95f36e14cf39631c0f5bfb1d630f10b00ed (patch) | |
| tree | 95c12a37af0038c84e0c98b386730478ce316a40 | |
| parent | 844171ae6d0a3a02cfb9a39ff18a27d7204a8755 (diff) | |
| parent | 8df35c03963dccc5a24caa8f5ab4c956ba87bcfd (diff) | |
| download | Qt-5010e95f36e14cf39631c0f5bfb1d630f10b00ed.zip Qt-5010e95f36e14cf39631c0f5bfb1d630f10b00ed.tar.gz Qt-5010e95f36e14cf39631c0f5bfb1d630f10b00ed.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:
Removed useless comments.
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 08ab3e7..1a691a9 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -104,9 +104,6 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { contains(CONFIG, plugin):QMAKE_ELF2E32_FLAGS += --definput=plugin_commonu.def - # The tee and grep at the end work around the issue that elf2e32 doesn't return non-null on error. - # The comparison of dso files is to avoid extra building of modules that depend on this dso, in - # case it has not changed. QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${TARGET}.dll $$symbianDestdir/$${TARGET}.sym \ && elf2e32_qtwrapper --version=$$decVersion \ --sid=$$TARGET.SID \ @@ -155,7 +152,6 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") { QMAKE_POST_LINK = $$replace(QMAKE_POST_LINK, "^@", "") QMAKE_POST_LINK = && $$QMAKE_POST_LINK } - # the tee and grep at the end work around the issue that elf2e32 doesn't return non-null on error QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${TARGET} $$symbianDestdir/$${TARGET}.sym \ && elf2e32_qtwrapper --version $$decVersion \ --sid=$$TARGET.SID \ |