From 10edf63174414cc95165c4fc14a3278e944dfbe2 Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Tue, 3 Jul 2012 16:06:01 +1000
Subject: 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/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/tools/qdbuscpp2xml')

diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
index 41756de5bc..87a7692333 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -71,6 +71,7 @@ static const char docTypeHeader[] =
 
 #include "moc.h"
 #include "generator.h"
+#include "preprocessor.h"
 
 #define PROGRAMNAME     "qdbuscpp2xml"
 #define PROGRAMVERSION  "0.2"
@@ -414,7 +415,7 @@ int main(int argc, char **argv)
         }
 
         Preprocessor pp;
-        Moc moc(pp);
+        Moc moc;
         pp.macros["Q_MOC_RUN"];
         pp.macros["__cplusplus"];
 
-- 
cgit v1.2.3