diff options
| author | axis <qt-info@nokia.com> | 2010-07-22 17:28:10 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-22 17:28:10 (GMT) |
| commit | 77bd18e7636a65c3a3be5e8e912484e8dc5fee02 (patch) | |
| tree | 0c3cb3d79a9b65c046e63872750ef6b1aa03722e | |
| parent | f1d92df9ba30c1a7e97b29dd069db8e7bbb25636 (diff) | |
| download | Qt-77bd18e7636a65c3a3be5e8e912484e8dc5fee02.zip Qt-77bd18e7636a65c3a3be5e8e912484e8dc5fee02.tar.gz Qt-77bd18e7636a65c3a3be5e8e912484e8dc5fee02.tar.bz2 | |
Added silent behavior to the most important Symbian build steps.
Task: QTBUG-11927
RevBy: Trust me
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 5 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 09a9aa9..a36193e 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -139,6 +139,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { $$capability \ $$QMAKE_ELF2E32_FLAGS \ $$QMAKE_POST_LINK + silent:QMAKE_POST_LINK = @echo postlinking $@ && $$QMAKE_POST_LINK QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.sym QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.dso QMAKE_CLEAN += $${symbianObjdir}/$${baseTarget}.dso @@ -185,6 +186,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") { $$QMAKE_ELF2E32_FLAGS \ && ln "$${symbianDestdir}/$${baseTarget}.exe" "$${symbianDestdir}/$${baseTarget}" \ $$QMAKE_POST_LINK + silent:QMAKE_POST_LINK = @echo postlinking $@ && $$QMAKE_POST_LINK QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.sym QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.exe QMAKE_CLEAN += $${symbianDestdir}/$${baseTarget} @@ -251,6 +253,7 @@ symbianresources.commands = cpp -nostdinc -undef \ -o$${symbianDestdir}/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsc \ -h$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsg \ -i${QMAKE_FILE_NAME} +silent:symbianresources.commands = @echo rcomp $< && $$symbianresources.commands symbianresources.dependency_type = TYPE_C symbianresources.CONFIG = no_link target_predeps @@ -274,6 +277,7 @@ contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") { -o$${symbianDestdir}/$${baseResourceTarget}.rsc \ -h$${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg \ -i$${baseResourceTarget}.rss + silent:symbianGenResource.commands = @echo rcomp $${baseResourceTarget}.rss && $$symbianGenResource.commands symbianGenResource.depends = $${baseResourceTarget}.rss PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg @@ -292,6 +296,7 @@ contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") { -o$${symbianDestdir}/$${baseResourceTarget}_reg.rsc \ -h$${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg \ -i$${baseResourceTarget}_reg.rss + silent:symbianGenRegResource.commands = @echo rcomp $${baseResourceTarget}_reg.rss && $$symbianGenRegResource.commands symbianGenRegResource.depends = $${baseResourceTarget}_reg.rss $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri index ab8d846..494c64c 100644 --- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri +++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri @@ -13,6 +13,7 @@ && $$QMAKE_COPY ${QMAKE_FILE_OUT_BASE}.h ${QMAKE_FILE_OUT}.tmp \ && $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.h \ && $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT} + silent:symbian_sqlite3_header.commands = @echo unzipping $@ && $$symbian_sqlite3_header.commands QMAKE_EXTRA_COMPILERS += symbian_sqlite3_header # The QMAKE_COPY section is to update timestamp on the file. @@ -24,6 +25,7 @@ && $$QMAKE_COPY ${QMAKE_FILE_OUT_BASE}.dso ${QMAKE_FILE_OUT}.tmp \ && $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.dso \ && $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT} + silent:symbian_sqlite3_dso.commands = @echo unzipping $@ && $$symbian_sqlite3_dso.commands QMAKE_EXTRA_COMPILERS += symbian_sqlite3_dso symbian_sqlite3_ver_dso.input = symbian_sqlite3_zip_file |