diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-07-03 16:06:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-04 00:48:44 +0200 |
| commit | 10edf63174414cc95165c4fc14a3278e944dfbe2 (patch) | |
| tree | fcf9f0cd2d4ee429a76339df7d32c00b257cbb74 /src/tools/moc/main.cpp | |
| parent | 0ce1574dad6f80d563c61259b4d4bff84d03b889 (diff) | |
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>
Diffstat (limited to 'src/tools/moc/main.cpp')
| -rw-r--r-- | src/tools/moc/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index 7db8737975..905eed1c5d 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -167,7 +167,7 @@ int runMoc(int _argc, char **_argv) bool autoInclude = true; bool defaultInclude = true; Preprocessor pp; - Moc moc(pp); + Moc moc; pp.macros["Q_MOC_RUN"]; pp.macros["__cplusplus"]; QByteArray filename; |