Revert "Allow moc to handle symbols that have been redefined."
authorMatthew Vogt <matthew.vogt@nokia.com>
Tue, 3 Jul 2012 06:06:01 +0000 (16:06 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 3 Jul 2012 22:48:44 +0000 (00:48 +0200)
commit10edf63174414cc95165c4fc14a3278e944dfbe2
treefcf9f0cd2d4ee429a76339df7d32c00b257cbb74
parent0ce1574dad6f80d563c61259b4d4bff84d03b889
Revert "Allow moc to handle symbols that have been redefined."

This reverts commit 5bb1408927b4eb5a03e8ab9f7cbc68f80d8a3962.

The temporary measure used to support redefinition of QtDeclarative
class names during the transition period is no longer required.

Task-number: QTBUG-24517
Change-Id: Ib90f08fcdfb02e004e594ac72b698eaa0325d98d
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
src/corelib/kernel/qobjectdefs.h
src/tools/moc/main.cpp
src/tools/moc/moc.cpp
src/tools/moc/moc.h
src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
tests/auto/tools/moc/tst_moc.cpp