diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:35 +0100 |
| commit | 00cf1300fc127d4656f474de46ff845d917b0a26 (patch) | |
| tree | 445cc5f56bcfdeef7500aff6cec8de1ec61c9095 /mkspecs/features | |
| parent | 5480b2105fcb3726ce36fbef07d7c2f93709ddc1 (diff) | |
| parent | 10bcb2ee73b557a9dfd72143f7bf0b42c607ecaf (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I327045f701339ce2bf54b47a3a5ea9b08cdcc5f8
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qscxmlc.prf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/features/qscxmlc.prf b/mkspecs/features/qscxmlc.prf index 674abcb..25f1f10 100644 --- a/mkspecs/features/qscxmlc.prf +++ b/mkspecs/features/qscxmlc.prf @@ -9,8 +9,6 @@ debug_and_release { QSCXMLC_DIR = $$QSCXMLC_DIR$$SUFFIX -msvc:lessThan(MSC_VER,1800):QMAKE_QSCXMLC=$$QMAKE_QSCXMLC --no-c++11 # VS2012 cannot handle initializer lists. - { qscxmlc.name = QSCXMLC ${QMAKE_FILE_IN}.h qscxmlc.input = STATECHARTS |