diff options
| author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2016-02-17 15:47:58 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2016-03-07 13:15:36 +0000 |
| commit | 668518fd978326c53f2327afd37891fb4b32bf5f (patch) | |
| tree | 29d280e7f5ea76d196edddafaa04b98c60a18998 | |
| parent | f875a4546eee8d27607f33995121ff10225b3d21 (diff) | |
Rename qscxmlc options
Change-Id: I6014b117424779f51f28710b6df5635e41d22fae
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| -rw-r--r-- | mkspecs/features/qscxmlc.prf | 4 | ||||
| -rw-r--r-- | tests/auto/scion/scion.pro | 4 | ||||
| -rw-r--r-- | tools/qscxmlc/qscxmlc.cpp | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/mkspecs/features/qscxmlc.prf b/mkspecs/features/qscxmlc.prf index 6ed1ad7..ea27c05 100644 --- a/mkspecs/features/qscxmlc.prf +++ b/mkspecs/features/qscxmlc.prf @@ -11,13 +11,13 @@ 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. +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 qscxmlc.variable_out = QSCXMLC_HEADERS -qscxmlc.commands = $$QMAKE_QSCXMLC ${QMAKE_FILE_IN} -oh ${QMAKE_FILE_OUT} -ocpp $$QSCXMLC_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)} +qscxmlc.commands = $$QMAKE_QSCXMLC ${QMAKE_FILE_IN} --header ${QMAKE_FILE_OUT} --impl $$QSCXMLC_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)} qscxmlc.output = $$QSCXMLC_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} qscxmlc.CONFIG += target_predeps qscxmlc.depends += $$QMAKE_QSCXMLC_EXE diff --git a/tests/auto/scion/scion.pro b/tests/auto/scion/scion.pro index ffdc619..d3d4562 100644 --- a/tests/auto/scion/scion.pro +++ b/tests/auto/scion/scion.pro @@ -27,14 +27,14 @@ defineReplace(nameTheClass) { win32 { QSCXMLC_DEP=$$[QT_HOST_BINS]/qscxmlc.exe -QSCXMLC_CMD=$$QSCXMLC_DEP -no-c++11 +QSCXMLC_CMD=$$QSCXMLC_DEP --no-c++11 msvc: QMAKE_CXXFLAGS += /bigobj } else { QSCXMLC_DEP=$$[QT_HOST_BINS]/qscxmlc QSCXMLC_CMD=$$QSCXMLC_DEP } -myscxml.commands = $$QSCXMLC_CMD -oh scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.h -ocpp ${QMAKE_FILE_OUT} -namespace ${QMAKE_FUNC_nameTheNamespace} -classname ${QMAKE_FUNC_nameTheClass} ${QMAKE_FILE_IN} +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.output = scxml/${QMAKE_FUNC_nameTheNamespace}_${QMAKE_FILE_IN_BASE}.cpp myscxml.input = SCXMLS diff --git a/tools/qscxmlc/qscxmlc.cpp b/tools/qscxmlc/qscxmlc.cpp index 2cfb4b9..82eb8df 100644 --- a/tools/qscxmlc/qscxmlc.cpp +++ b/tools/qscxmlc/qscxmlc.cpp @@ -91,7 +91,6 @@ int main(int argc, char *argv[]) QCommandLineParser cmdParser; - cmdParser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); cmdParser.addHelpOption(); cmdParser.addVersionOption(); cmdParser.setApplicationDescription(QCoreApplication::translate("main", @@ -102,13 +101,13 @@ int main(int argc, char *argv[]) QCommandLineOption optionNamespace(QLatin1String("namespace"), QCoreApplication::translate("main", "Put generated code into <namespace>."), QCoreApplication::translate("main", "namespace")); - QCommandLineOption optionOutputBaseName(QLatin1String("o"), + QCommandLineOption optionOutputBaseName(QStringList() << QLatin1String("o") << QLatin1String("output"), QCoreApplication::translate("main", "Generate <name>.h and <name>.cpp files."), QCoreApplication::translate("main", "name")); - QCommandLineOption optionOutputHeaderName(QLatin1String("oh"), + QCommandLineOption optionOutputHeaderName(QLatin1String("header"), QCoreApplication::translate("main", "Generate <name> for the header file."), QCoreApplication::translate("main", "name")); - QCommandLineOption optionOutputSourceName(QLatin1String("ocpp"), + QCommandLineOption optionOutputSourceName(QLatin1String("impl"), QCoreApplication::translate("main", "Generate <name> for the source file."), QCoreApplication::translate("main", "name")); QCommandLineOption optionClassName(QLatin1String("classname"), |