diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-06-05 04:23:53 +0000 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-06-05 09:00:54 +0000 |
| commit | 934235e967b4e3c96fa3ebf0338497cc0604e270 (patch) | |
| tree | f502fa736ff3c71c0c4dcbc1e77d8bf1ba3c5aa1 /src | |
| parent | d56c6cf7a4fe2b7e5543d58a786efc768b7370c2 (diff) | |
Revert "moc: remove _MSC_EXTENSIONS #define"
It seems this change is preventing us to integrate qt5.git in '5.9'
This reverts commit c3030d7163245b55abfd09eefe696c035c55011c.
Task-number: QTBUG-61204
Change-Id: Id98afaa23be0a8dd6f2c54a899f46542c65436aa
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/moc/main.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index 25f2fd45bf..b30de66258 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -380,9 +380,6 @@ int runMoc(int argc, char **argv) error("Missing macro name"); parser.showHelp(1); } - // Prevent parse errors on MSVC extensions. - if (name == "_MSC_EXTENSIONS") - continue; Macro macro; macro.symbols = Preprocessor::tokenize(value, 1, Preprocessor::TokenizeDefine); macro.symbols.removeLast(); // remove the EOF symbol |