CLIProcessor.cpp   CLIProcessor.cpp 
skipping to change at line 58 skipping to change at line 58
std::cout << "Usage:\n" std::cout << "Usage:\n"
<< " " << " "
<< qPrintable(binName) << " [options]\n\n" << qPrintable(binName) << " [options]\n\n"
<< "Options:\n" << "Options:\n"
<< "--version (or -v) : Print program name a nd version and exit.\n" << "--version (or -v) : Print program name a nd version and exit.\n"
<< "--help (or -h) : This cruft.\n" << "--help (or -h) : This cruft.\n"
<< "--config-file (or -c) : Use an alternative n ame for the config file\n" << "--config-file (or -c) : Use an alternative n ame for the config file\n"
<< "--user-dir (or -u) : Use an alternative u ser data directory\n" << "--user-dir (or -u) : Use an alternative u ser data directory\n"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
<< "--angle-mode (or -a) : Use ANGLE as OpenGL << "--angle-mode (or -a) : Use ANGLE as OpenGL
ES2 rendering engine\n" ES2 rendering engine (autodetect driver)\n"
<< "--angle-d3d9 (or -9) : Force use Direct3D 9
for ANGLE OpenGL ES2 rendering engine\n"
<< "--angle-d3d11 : Force use Direct3D 1
1 for ANGLE OpenGL ES2 rendering engine\n"
<< "--angle-warp : Force use the Direct
3D 11 software rasterizer for ANGLE OpenGL ES2 rendering engine\n"
<< "--mesa-mode (or -m) : Use MESA as software OpenGL rendering engine\n" << "--mesa-mode (or -m) : Use MESA as software OpenGL rendering engine\n"
<< "--safe-mode (or -s) : Synonymous to --mesa -mode \n" << "--safe-mode (or -s) : Synonymous to --mesa -mode \n"
#endif #endif
<< "--dump-opengl-details (or -d) : dump informati on about OpenGL support to logfile.\n" << "--dump-opengl-details (or -d) : dump informati on about OpenGL support to logfile.\n"
<< " Use this is you have graphics problems\n" << " Use this is you have graphics problems\n"
<< " and want to send a b ug report\n" << " and want to send a b ug report\n"
<< "--full-screen (or -f) : With argument \"yes\ " or \"no\" over-rides\n" << "--full-screen (or -f) : With argument \"yes\ " or \"no\" over-rides\n"
<< " the full screen sett ing in the config file\n" << " the full screen sett ing in the config file\n"
<< "--screenshot-dir : Specify directory to save screenshots\n" << "--screenshot-dir : Specify directory to save screenshots\n"
<< "--startup-script : Specify name of star tup script\n" << "--startup-script : Specify name of star tup script\n"
skipping to change at line 95 skipping to change at line 98
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if (argsGetOption(argList, "-s", "--safe-mode")) if (argsGetOption(argList, "-s", "--safe-mode"))
{ {
qApp->setProperty("onetime_mesa_mode", true); qApp->setProperty("onetime_mesa_mode", true);
} }
if (argsGetOption(argList, "-a", "--angle-mode")) if (argsGetOption(argList, "-a", "--angle-mode"))
{ {
qApp->setProperty("onetime_angle_mode", true); qApp->setProperty("onetime_angle_mode", true);
} }
if (argsGetOption(argList, "-9", "--angle-d3d9"))
{
qputenv("QT_ANGLE_PLATFORM", "d3d9");
qApp->setProperty("onetime_angle_mode", true);
}
if (argsGetOption(argList, "", "--angle-d3d11"))
{
qputenv("QT_ANGLE_PLATFORM", "d3d11");
qApp->setProperty("onetime_angle_mode", true);
}
if (argsGetOption(argList, "", "--angle-warp"))
{
qputenv("QT_ANGLE_PLATFORM", "warp");
qApp->setProperty("onetime_angle_mode", true);
}
if (argsGetOption(argList, "-m", "--mesa-mode")) if (argsGetOption(argList, "-m", "--mesa-mode"))
{ {
qApp->setProperty("onetime_mesa_mode", true); qApp->setProperty("onetime_mesa_mode", true);
} }
#endif #endif
if (argsGetOption(argList, "", "--list-landscapes")) if (argsGetOption(argList, "", "--list-landscapes"))
{ {
const QSet<QString>& landscapeIds = StelFileMgr::listContent s("landscapes", StelFileMgr::Directory); const QSet<QString>& landscapeIds = StelFileMgr::listContent s("landscapes", StelFileMgr::Directory);
foreach (const QString& i, landscapeIds) foreach (const QString& i, landscapeIds)
{ {
 End of changes. 2 change blocks. 
2 lines changed or deleted 23 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/