git.iko.soy/unity8
on xenial help sign in
Implemented support for all requested cli options
50572adJosh Arenson
src/main.cpp+12−8
compare with xenial
unifiedsplit
@@ -49,18 +49,22 @@ int startShell(int argc, const char** argv, void* server)
49 parser.setApplicationDescription("Description: Unity 8 Shell");
49 parser.setApplicationDescription("Description: Unity 8 Shell");
50 parser.addHelpOption();
50 parser.addHelpOption();
51
51
52− QCommandLineOption fullscreenOption ("fullscreen",
52+ QCommandLineOption fullscreenOption("fullscreen",
53− QCoreApplication::translate("fullscreen","Run in fullscreen"));
53+ QCoreApplication::translate("fullscreen", "Run in fullscreen"));
54 parser.addOption(fullscreenOption);
54 parser.addOption(fullscreenOption);
55
55
56− QCommandLineOption framelessOption ("frameless",
56+ QCommandLineOption framelessOption("frameless",
57− QCoreApplication::translate("frameless","Run without window borders"));
57+ QCoreApplication::translate("frameless", "Run without window borders"));
58 parser.addOption(framelessOption);
58 parser.addOption(framelessOption);
59
59
60− QCommandLineOption mousetouchOption ("mousetouch",
60+ QCommandLineOption mousetouchOption("mousetouch",
61− QCoreApplication::translate("mousetouch","Allow the mouse to provide touch input"));
61+ QCoreApplication::translate("mousetouch", "Allow the mouse to provide touch input"));
62 parser.addOption(mousetouchOption);
62 parser.addOption(mousetouchOption);
63−
63+
64+ QCommandLineOption testabilityOption("testability",
65+ QCoreApplication::translate("testability", "DISCOURAGED: Please set \
66+QT_LOAD_TESTABILITY instead. \nLoad the testability driver"));
67+ parser.addOption(testabilityOption);
64
68
65 if (isUbuntuMirServer) {
69 if (isUbuntuMirServer) {
66 QLibrary unityMir("unity-mir", 1);
70 QLibrary unityMir("unity-mir", 1);
@@ -92,7 +96,7 @@ int startShell(int argc, const char** argv, void* server)
92
96
93 // The testability driver is only loaded by QApplication but not by QGuiApplication.
97 // The testability driver is only loaded by QApplication but not by QGuiApplication.
94 // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
98 // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
95− if (args.contains(QLatin1String("-testability")) || getenv("QT_LOAD_TESTABILITY")) {
99+ if (parser.isSet(testabilityOption) || getenv("QT_LOAD_TESTABILITY")) {
96 QLibrary testLib(QLatin1String("qttestability"));
100 QLibrary testLib(QLatin1String("qttestability"));
97 if (testLib.load()) {
101 if (testLib.load()) {
98 typedef void (*TasInitialize)(void);
102 typedef void (*TasInitialize)(void);