f9350f7 · unity8 · git.iko.soy

git.iko.soy/unity8

Fix bad merge (add UnityCommandLineParser::deviceName back)

commitf9350f74121b7df5c82d670605532977040621f6 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateMon 20 Apr 2015, 10:20 (11 years ago) parentd63d590

2 files changed+7

compare with xenial

unifiedsplit

src/UnityCommandLineParser.cpp+5 src/UnityCommandLineParser.h+2

src/UnityCommandLineParser.cpp+5

@@ -49,6 +49,10 @@ UnityCommandLineParser::UnityCommandLineParser(const QCoreApplication &app)

4949 "DISCOURAGED: Please set QT_LOAD_TESTABILITY instead.\nLoad the testability driver");

5050 parser.addOption(testabilityOption);

5151

52+ QCommandLineOption devicenameOption(QStringList() << "devicename",

53+ "Specify the device name instead of letting Unity 8 find it out", "devicename", "");

54+ parser.addOption(devicenameOption);

55+

5256 QCommandLineOption modeOption("mode",

5357 "Whether to run greeter and/or shell [full-greeter, full-shell, greeter, shell]",

5458 "mode", "full-greeter");

@@ -73,6 +77,7 @@ UnityCommandLineParser::UnityCommandLineParser(const QCoreApplication &app)

7377 m_hasFrameless = parser.isSet(framelessOption);

7478 m_hasMouseToTouch = parser.isSet(mousetouchOption);

7579 m_hasFullscreen = parser.isSet(fullscreenOption);

80+ m_deviceName = parser.value(devicenameOption);

7681 resolveMode(parser, modeOption);

7782}

7883

src/UnityCommandLineParser.h+2

@@ -30,6 +30,7 @@ public:

3030 bool hasFrameless() const { return m_hasFrameless; }

3131 bool hasMouseToTouch() const { return m_hasMouseToTouch; }

3232 bool hasFullscreen() const { return m_hasFullscreen; }

33+ QString deviceName() const { return m_deviceName; }

3334 QString mode() const { return m_mode; }

3435private:

3536

@@ -44,6 +45,7 @@ private:

4445 bool m_hasFrameless;

4546 bool m_hasMouseToTouch;

4647 bool m_hasFullscreen;

48+ QString m_deviceName;

4749 QString m_mode;

4850};

4951