|
1 | 1 | #include "util/cmdlineargs.h" |
2 | 2 |
|
| 3 | +#include <qglobal.h> |
3 | 4 | #include <stdio.h> |
4 | 5 | #ifndef __WINDOWS__ |
5 | 6 | #include <unistd.h> |
@@ -280,10 +281,20 @@ bool CmdlineArgs::parse(const QStringList& arguments, CmdlineArgs::ParseMode mod |
280 | 281 | parser.addOption(developer); |
281 | 282 |
|
282 | 283 | #ifdef MIXXX_USE_QML |
283 | | - const QCommandLineOption qml(QStringLiteral("qml"), |
284 | | - forUserFeedback ? QCoreApplication::translate("CmdlineArgs", |
285 | | - "Loads experimental QML GUI instead of legacy QWidget skin") |
286 | | - : QString()); |
| 284 | + const QCommandLineOption qml(QStringLiteral("next"), |
| 285 | + forUserFeedback |
| 286 | + ? QCoreApplication::translate("CmdlineArgs", |
| 287 | + "Loads the highly unstable 3.0 Mixxx interface, " |
| 288 | + "based on QML. You need to use a new setting " |
| 289 | + "profile, or run with " |
| 290 | + "'allow-dangerous-data-corruption-risk' to use " |
| 291 | + "with the current one. We highly recommend " |
| 292 | + "backing up you data if you do so.") |
| 293 | + : QString()); |
| 294 | + QCommandLineOption qmlDeprecated( |
| 295 | + QStringLiteral("qml")); |
| 296 | + qmlDeprecated.setFlags(QCommandLineOption::HiddenFromHelp); |
| 297 | + parser.addOption(qmlDeprecated); |
287 | 298 | parser.addOption(qml); |
288 | 299 | const QCommandLineOption awareOfRisk( |
289 | 300 | QStringLiteral("allow-dangerous-data-corruption-risk"), |
@@ -467,6 +478,11 @@ bool CmdlineArgs::parse(const QStringList& arguments, CmdlineArgs::ParseMode mod |
467 | 478 | m_developer = parser.isSet(developer); |
468 | 479 | #ifdef MIXXX_USE_QML |
469 | 480 | m_qml = parser.isSet(qml); |
| 481 | + if (parser.isSet(qmlDeprecated)) { |
| 482 | + m_qml |= true; |
| 483 | + qWarning() << "The argument '--qml' is deprecated and will be soon " |
| 484 | + "removed. Please use '--next' instead!"; |
| 485 | + } |
470 | 486 | m_awareOfRisk = parser.isSet(awareOfRisk); |
471 | 487 | #endif |
472 | 488 | m_safeMode = parser.isSet(safeMode) || parser.isSet(safeModeDeprecated); |
|
0 commit comments