Merge QObject::tr*() and QCoreApplication::translate() overloads
authorBradley T. Hughes <bradley.hughes@nokia.com>
Mon, 28 Nov 2011 14:24:25 +0000 (15:24 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 30 Nov 2011 21:28:02 +0000 (22:28 +0100)
commit53a420a4d1a2d845603dd85ce9ce345c6819088e
tree6b1e78ddcfc8843122805273c51cef932c9125e1
parent49140efe2d0a31fd529b8e6af09e0df31e3a719c
Merge QObject::tr*() and QCoreApplication::translate() overloads

These were marked as TODO items for Qt 5. Do them now. (The TODO item
was added when plural support was added back in the early Qt 4 days.)

Change-Id: I3be50bc657582db730401103d691234695784340
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
src/corelib/kernel/qcoreapplication.cpp
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qobject.h
src/corelib/kernel/qobjectdefs.h