Merge two simple version of translate() functions for QT_NO_TRANSLATION
authorTasuku Suzuki <tasuku.suzuki@nokia.com>
Wed, 16 May 2012 19:52:33 +0000 (04:52 +0900)
committerQt by Nokia <qt-info@nokia.com>
Fri, 18 May 2012 13:22:22 +0000 (15:22 +0200)
commitbdc28e35806d93b259830f8b3fecdf60761c62d0
treead302d0c1fbabb74c782cc6e65e702367052cc34
parentdbcbd4708b8fdabdbf80ad8405bcb871ebf23ccc
Merge two simple version of translate() functions for QT_NO_TRANSLATION

the commit 53a420a4d1a2d845603dd85ce9ce345c6819088e merged translate()
functions. The simple versions need to be merged too.

Change-Id: Ie873483beb8ed0b911ae0568e97b427f4c6b74e3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
src/corelib/kernel/qcoreapplication.h