summaryrefslogtreecommitdiffstats
path: root/src/tools/moc/main.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-12-06 17:54:47 -0800
committerJani Heikkinen <jani.heikkinen@qt.io>2016-12-08 05:09:31 +0000
commite1a70ce495928e8d81e80b11d7dbd4c4913ee438 (patch)
tree8d73b57689b4d985a8d1655365200a643acb9167 /src/tools/moc/main.cpp
parent093e1111ef68a8a83e42d5d82fc9d5c93d47071b (diff)
moc: force the Microsoft compiler not to define _MSC_EXTENSIONS
This re-fixes commit d72ac3f35f4c6d6405e9675d54124b3ddb8d80ab, which simply removed the #define but did so at the wrong place. Instead of forcing the macro to be removed, let's simply not have it defined in the first place. Change-Id: Ie6dbad9bbbd9488887e8fffd148dd67d9a31b32e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/tools/moc/main.cpp')
-rw-r--r--src/tools/moc/main.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index 55cf7ed872..6128d5490b 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -477,9 +477,6 @@ int runMoc(int argc, char **argv)
}
moc.symbols += pp.preprocessed(moc.filename, &in);
- // We obviously do not support MS extensions
- pp.macros.remove("_MSC_EXTENSIONS");
-
if (!pp.preprocessOnly) {
// 2. parse
moc.parse();