diff options
| -rw-r--r-- | mkspecs/features/qscxmlc.prf | 2 | ||||
| -rw-r--r-- | tests/auto/scion/scion.pro | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/mkspecs/features/qscxmlc.prf b/mkspecs/features/qscxmlc.prf index ea27c05..4631377 100644 --- a/mkspecs/features/qscxmlc.prf +++ b/mkspecs/features/qscxmlc.prf @@ -8,8 +8,6 @@ debug_and_release { } QSCXMLC_DIR = $$QSCXMLC_DIR$$SUFFIX -QMAKE_QSCXMLC_EXE=$$[QT_HOST_BINS]/qscxmlc -win*:QMAKE_QSCXMLC_EXE=$$QMAKE_QSCXMLC_EXE.exe msvc:lessThan(MSC_VER,1800):QMAKE_QSCXMLC=$$QMAKE_QSCXMLC --no-c++11 # VS2012 cannot handle initializer lists. diff --git a/tests/auto/scion/scion.pro b/tests/auto/scion/scion.pro index d3d4562..8ef2677 100644 --- a/tests/auto/scion/scion.pro +++ b/tests/auto/scion/scion.pro @@ -25,17 +25,15 @@ defineReplace(nameTheClass) { return ($$cn) } +qtPrepareTool(QMAKE_QSCXMLC, qscxmlc) + win32 { -QSCXMLC_DEP=$$[QT_HOST_BINS]/qscxmlc.exe -QSCXMLC_CMD=$$QSCXMLC_DEP --no-c++11 -msvc: QMAKE_CXXFLAGS += /bigobj -} else { -QSCXMLC_DEP=$$[QT_HOST_BINS]/qscxmlc -QSCXMLC_CMD=$$QSCXMLC_DEP + QMAKE_QSCXMLC += --no-c++11 + msvc: QMAKE_CXXFLAGS += /bigobj } -myscxml.commands = $$QSCXMLC_CMD --header scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.h --impl ${QMAKE_FILE_OUT} --namespace ${QMAKE_FUNC_nameTheNamespace} --classname ${QMAKE_FUNC_nameTheClass} ${QMAKE_FILE_IN} -myscxml.depends += $$QSCXMLC_DEP +myscxml.commands = $$QMAKE_QSCXMLC --header scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.h --impl ${QMAKE_FILE_OUT} --namespace ${QMAKE_FUNC_nameTheNamespace} --classname ${QMAKE_FUNC_nameTheClass} ${QMAKE_FILE_IN} +myscxml.depends += $$QMAKE_QSCXMLC_EXE myscxml.output = scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.cpp myscxml.input = SCXMLS myscxml.variable_out = SOURCES |