Merge lp:~gerboland/qtmir/fix-cmdline-args into lp:qtmir

[Gerry Boland]

Allow Mir remove command line arguments it understands, before letting Qt process them.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:393
http://jenkins.qa.ubuntu.com/job/qtmir-ci/541/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/237/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/237/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/274/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/274/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/119/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/541/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Not comfortable with the "_p" suffix in "argvHelper_p.h". We're not using this naming convention anywhere in the project. And it doesn't make much sense as mirserver is not exporting any headers in the first place, so I don't see the need for that differentiation.

[Daniel d'Andrada (dandrader)]

> Not comfortable with the "_p" suffix in "argvHelper_p.h". We're not using this
> naming convention anywhere in the project. And it doesn't make much sense as
> mirserver is not exporting any headers in the first place, so I don't see the
> need for that differentiation.

Biting my tongue, we do use this already. :)

[Daniel d'Andrada (dandrader)]

Copy-and-paste issue in tests/mirserver/ArgvHelper/argvHelper_test.cpp:

"""
 * Copyright (C) 2014-2015 Canonical, Ltd.
"""

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

"""
    const char *filteredArgv[3] = { "-fullscreen", "-testability" };
"""

For completeness it would be interesting if you added an entry that is not present in argv.

[Gerry Boland (gerboland)]

> """
> const char *filteredArgv[3] = { "-fullscreen", "-testability" };
> """
>
> For completeness it would be interesting if you added an entry that is not
> present in argv.

That isn't a realistic use-case for the api, but if you really want it...

[Daniel d'Andrada (dandrader)]

> """
> const char *filteredArgv[3] = { "-fullscreen", "-testability" };
> """
>
> For completeness it would be interesting if you added an entry that is not
> present in argv.

And if you care about having a trailing null parameter, the following would be better form:

const char *filteredArgv[] = { "-fullscreen", "-testability", nullptr };

[Daniel d'Andrada (dandrader)]

> > """
> > const char *filteredArgv[3] = { "-fullscreen", "-testability" };
> > """
> >
> > For completeness it would be interesting if you added an entry that is not
> > present in argv.
>
> That isn't a realistic use-case for the api, but if you really want it...

Oh, really? Then ok, ignore me.

[lp:~gerboland/qtmir/fix-cmdline-args]

394. By Gerry Boland on 2015-10-30

People do not trust C standards, so explicitly null terminate arrays

395. By Gerry Boland on 2015-10-30

Fix copyright header

396. By Gerry Boland on 2015-10-30

Remove insinuation of private header: _p

[Gerry Boland (gerboland)]

Review comments addressed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:396
http://jenkins.qa.ubuntu.com/job/qtmir-ci/542/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/120/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/275/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/275/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/120/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/542/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

"""
    if (!unknownArgsFound) { // mir parsed all the arguments, so edit argv to pretend to have just argv[0]
        argc = 1;
    }
"""

It's worth commenting that the command_line_handler never gets called in this case. I would never have guessed that. I was thinking that this was some redundant optimization before.

[Daniel d'Andrada (dandrader)]

> """
> if (!unknownArgsFound) { // mir parsed all the arguments, so edit argv to
> pretend to have just argv[0]
> argc = 1;
> }
> """
>
> It's worth commenting that the command_line_handler never gets called in this
> case. I would never have guessed that. I was thinking that this was some
> redundant optimization before.

Hmmm, but unknownArgsFound serves as a hint for that. Nevermind

[Daniel d'Andrada (dandrader)]

LGTM

review: Approve

[lp:~gerboland/qtmir/fix-cmdline-args]

397. By Gerry Boland on 2015-11-17

Merge trunk

398. By Gerry Boland on 2015-11-17

Merge lp:~unity-team/qtmir/build_with_clang to pre-empt conflicts on landing

399. By Gerry Boland on 2015-11-20

Merge trunk

400. By Gerry Boland on 2015-12-12

Merge trunk

401. By Gerry Boland on 2015-12-12

Fix test fail due to assert maths error

402. By Gerry Boland on 2016-02-15

Merge trunk

403. By Gerry Boland on 2016-02-15

Fix error in previous merge

Unmerged revisions

=== modified file 'src/modules/Unity/Application/desktopfilereader.cpp'
--- src/modules/Unity/Application/desktopfilereader.cpp	2015-09-28 20:11:39 +0000
+++ src/modules/Unity/Application/desktopfilereader.cpp	2015-11-17 14:21:31 +0000
@@ -37,8 +37,9 @@
 
 typedef GObjectScopedPointer<GAppInfo> GAppInfoPointer;
 
-struct DesktopFileReaderPrivate
+class DesktopFileReaderPrivate
 {
+public:
     DesktopFileReaderPrivate(DesktopFileReader *parent):
             q_ptr( parent )
     {}

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.h'
--- src/modules/Unity/Application/mirsurfaceitem.h	2015-10-19 15:40:27 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.h	2015-11-17 14:21:31 +0000
@@ -103,7 +103,7 @@
 
     void touchEvent(QTouchEvent *event) override;
 
-    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
+    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
 
     void releaseResources() override;
 

=== modified file 'src/modules/Unity/Application/objectlistmodel.h'
--- src/modules/Unity/Application/objectlistmodel.h	2014-08-29 11:15:51 +0000
+++ src/modules/Unity/Application/objectlistmodel.h	2015-11-17 14:21:31 +0000
@@ -78,7 +78,7 @@
         return QVariant();
     }
 
-    QHash<int, QByteArray> roleNames() const
+    QHash<int, QByteArray> roleNames() const override
     {
         QHash<int, QByteArray> roleNames;
         roleNames.insert(RoleModelData, "modelData");

=== added file 'src/platforms/mirserver/argvHelper.h'
--- src/platforms/mirserver/argvHelper.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/argvHelper.h	2015-11-17 14:21:31 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ARGVHELPER_P_H
+#define ARGVHELPER_P_H
+
+#include <cassert>
+
+namespace qtmir {
+
+// Function to edit argv to strip out unmatched entries of targetArray, so both arrays have identical contents
+// Note: Mir parses out arguments that it understands, but it also removes argv[0] (bug pad.lv/1511509)
+// so need to ensure argv[0] is the binary name as usual.
+void editArgvToMatch(int &argcToEdit, char** argvToEdit, int targetCount, const char* const targetArray[])
+{
+    // Make copy of the argv array of pointers, as we will be editing the original
+    const size_t arraySize = (argcToEdit + 1) * sizeof(char*);
+    char** argvCopy = static_cast<char**>(malloc(arraySize));
+    memcpy(argvCopy, argvToEdit, arraySize);
+
+    int k=1; // index of argv we want to edit - note we'll leave argv[0] alone
+    for (int i=0; i<targetCount; i++) { // taking each argument Mir did not parse out
+        for (int j=1; j<argcToEdit; j++) { // find pointer to same argument in argvCopy (leave arg[0] out)
+            if (strcmp(targetArray[i], argvCopy[j]) == 0) {
+                argvToEdit[k] = const_cast<char*>(argvCopy[j]); // edit argv to position that argument to match argv2.
+                k++;
+                break;
+            }
+        }
+    }
+    assert(k == targetCount);
+    argvToEdit[k] = nullptr;
+    free(argvCopy);
+    argcToEdit = targetCount+1; // now argv and targetArray should have list the same strings.
+}
+
+} // namespace qtmir
+
+#endif // ARGVHELPER_P_H

=== modified file 'src/platforms/mirserver/mirserver.cpp'
--- src/platforms/mirserver/mirserver.cpp	2015-10-27 10:17:45 +0000
+++ src/platforms/mirserver/mirserver.cpp	2015-11-17 14:21:31 +0000
@@ -19,6 +19,7 @@
 #include "mirserver.h"
 
 // local
+#include "argvHelper.h"
 #include "mirwindowmanager.h"
 #include "mirglconfig.h"
 #include "mirserverstatuslistener.h"
@@ -46,22 +47,24 @@
 namespace msh = mir::shell;
 namespace ms = mir::scene;
 
-namespace
-{
-void ignore_unparsed_arguments(int /*argc*/, char const* const/*argv*/[])
-{
-}
-}
-
 Q_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES, "qtmir.mir")
 
-MirServer::MirServer(int argc, char const* argv[],
+
+MirServer::MirServer(int &argc, char **argv,
                      const QSharedPointer<ScreenController> &screenController, QObject* parent)
     : QObject(parent)
     , m_screenController(screenController)
 {
-    set_command_line_handler(&ignore_unparsed_arguments);
-    set_command_line(argc, argv);
+    bool unknownArgsFound = false;
+    set_command_line_handler([&argc, &argv, &unknownArgsFound](int filteredCount, const char* const filteredArgv[]) {
+        unknownArgsFound = true;
+        // Want to edit argv to match that which Mir returns, as those are for to Qt alone to process. Edit existing
+        // argc as filteredArgv only defined in this scope.
+        qtmir::editArgvToMatch(argc, argv, filteredCount, filteredArgv);
+    });
+
+    // Casting char** to be a const char** safe as Mir won't change it, nor will we
+    set_command_line(argc, const_cast<const char **>(argv));
 
     override_the_session_listener([]
         {
@@ -121,7 +124,16 @@
         screenController->init(the_display(), the_compositor());
     });
 
-    apply_settings();
+    try {
+        apply_settings();
+    } catch (const std::exception &ex) {
+        qCritical() << ex.what();
+        exit(1);
+    }
+
+    if (!unknownArgsFound) { // mir parsed all the arguments, so edit argv to pretend to have just argv[0]
+        argc = 1;
+    }
 
     // We will draw our own cursor.
     // FIXME: Call override_the_cusor() instead once this method becomes available in a
@@ -133,6 +145,7 @@
     });
 
     qCDebug(QTMIR_MIR_MESSAGES) << "MirServer created";
+    qCDebug(QTMIR_MIR_MESSAGES) << "Command line arguments passed to Qt:" << QCoreApplication::arguments();
 }
 
 // Override default implementation to ensure we terminate the ScreenController first.

=== modified file 'src/platforms/mirserver/mirserver.h'
--- src/platforms/mirserver/mirserver.h	2015-08-20 10:16:54 +0000
+++ src/platforms/mirserver/mirserver.h	2015-11-17 14:21:31 +0000
@@ -40,7 +40,7 @@
     Q_PROPERTY(PromptSessionListener* promptSessionListener READ promptSessionListener CONSTANT)
 
 public:
-    MirServer(int argc, char const* argv[], const QSharedPointer<ScreenController> &, QObject* parent = 0);
+    MirServer(int &argc, char **argv, const QSharedPointer<ScreenController> &, QObject* parent = 0);
     ~MirServer() = default;
 
     /* mir specific */

=== modified file 'src/platforms/mirserver/mirserverintegration.cpp'
--- src/platforms/mirserver/mirserverintegration.cpp	2015-10-21 11:46:33 +0000
+++ src/platforms/mirserver/mirserverintegration.cpp	2015-11-17 14:21:31 +0000
@@ -51,11 +51,11 @@
 namespace mg = mir::graphics;
 using qtmir::Clipboard;
 
-MirServerIntegration::MirServerIntegration()
+MirServerIntegration::MirServerIntegration(int &argc, char **argv)
     : m_accessibility(new QPlatformAccessibility())
     , m_fontDb(new QGenericUnixFontDatabase())
     , m_services(new Services)
-    , m_mirServer(new QMirServer(QCoreApplication::arguments()))
+    , m_mirServer(new QMirServer(argc, argv))
     , m_nativeInterface(nullptr)
     , m_clipboard(new Clipboard)
 {

=== modified file 'src/platforms/mirserver/mirserverintegration.h'
--- src/platforms/mirserver/mirserverintegration.h	2015-08-20 10:16:54 +0000
+++ src/platforms/mirserver/mirserverintegration.h	2015-11-17 14:21:31 +0000
@@ -31,7 +31,7 @@
 class MirServerIntegration : public QPlatformIntegration
 {
 public:
-    MirServerIntegration();
+    MirServerIntegration(int &argc, char **argv);
     ~MirServerIntegration();
 
     bool hasCapability(QPlatformIntegration::Capability cap) const override;

=== modified file 'src/platforms/mirserver/plugin.cpp'
--- src/platforms/mirserver/plugin.cpp	2015-08-11 12:08:32 +0000
+++ src/platforms/mirserver/plugin.cpp	2015-11-17 14:21:31 +0000
@@ -17,14 +17,10 @@
 #include "plugin.h"
 #include "mirserverintegration.h"
 
-QStringList MirServerIntegrationPlugin::keys() const {
-    QStringList list;
-    list << "mirserver";
-    return list;
-}
-
-QPlatformIntegration* MirServerIntegrationPlugin::create(const QString &system, const QStringList &) {
+QPlatformIntegration *MirServerIntegrationPlugin::create(const QString &system, const QStringList &/*paramList*/,
+                                                         int &argc, char **argv)
+{
     if (system.toLower() == "mirserver")
-        return new MirServerIntegration;
+        return new MirServerIntegration(argc, argv);
     return 0;
 }

=== modified file 'src/platforms/mirserver/plugin.h'
--- src/platforms/mirserver/plugin.h	2015-08-11 12:08:32 +0000
+++ src/platforms/mirserver/plugin.h	2015-11-17 14:21:31 +0000
@@ -25,8 +25,7 @@
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "mirserver.json")
 
 public:
-    QStringList keys() const;
-    QPlatformIntegration* create(const QString&, const QStringList&);
+    QPlatformIntegration *create(const QString &system, const QStringList &paramList, int &argc, char **argv) override;
 };
 
 #endif // PLUGIN_H

=== modified file 'src/platforms/mirserver/qmirserver.cpp'
--- src/platforms/mirserver/qmirserver.cpp	2015-08-20 10:16:54 +0000
+++ src/platforms/mirserver/qmirserver.cpp	2015-11-17 14:21:31 +0000
@@ -26,24 +26,15 @@
 #include "screencontroller.h"
 #include "screen.h"
 
-QMirServer::QMirServer(const QStringList &arguments, QObject *parent)
+QMirServer::QMirServer(int &argc, char **argv, QObject *parent)
     : QObject(parent)
     , d_ptr(new QMirServerPrivate())
 {
     Q_D(QMirServer);
 
-    // convert arguments back into argc-argv form that Mir wants
-    int argc = arguments.size();
-    char **argv = new char*[argc + 1];
-    for (int i = 0; i < argc; i++) {
-        argv[i] = new char[strlen(arguments.at(i).toStdString().c_str())+1];
-        memcpy(argv[i], arguments.at(i).toStdString().c_str(), strlen(arguments.at(i).toStdString().c_str())+1);
-    }
-    argv[argc] = '\0';
-
     d->screenController = QSharedPointer<ScreenController>(new ScreenController());
 
-    d->server = QSharedPointer<MirServer>(new MirServer(argc, const_cast<const char**>(argv), d->screenController));
+    d->server = QSharedPointer<MirServer>(new MirServer(argc, argv, d->screenController));
 
     d->serverThread = new MirServerThread(d->server);
 

=== modified file 'src/platforms/mirserver/qmirserver.h'
--- src/platforms/mirserver/qmirserver.h	2015-08-20 10:16:54 +0000
+++ src/platforms/mirserver/qmirserver.h	2015-11-17 14:21:31 +0000
@@ -30,7 +30,7 @@
     Q_OBJECT
 
 public:
-    QMirServer(const QStringList &arguments, QObject* parent=0);
+    QMirServer(int &argc, char **argv, QObject* parent=0);
     virtual ~QMirServer();
 
     bool start();

=== modified file 'src/platforms/mirserver/qmirserver_p.h'
--- src/platforms/mirserver/qmirserver_p.h	2015-08-20 10:16:54 +0000
+++ src/platforms/mirserver/qmirserver_p.h	2015-11-17 14:21:31 +0000
@@ -32,8 +32,9 @@
 class QMirServer;
 class MirServerThread;
 
-struct QMirServerPrivate
+class QMirServerPrivate
 {
+public:
     QSharedPointer<MirServer> server;
     QSharedPointer<ScreenController> screenController;
     MirServerThread *serverThread;

=== added directory 'tests/mirserver/ArgvHelper'
=== added file 'tests/mirserver/ArgvHelper/CMakeLists.txt'
--- tests/mirserver/ArgvHelper/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mirserver/ArgvHelper/CMakeLists.txt	2015-11-17 14:21:31 +0000
@@ -0,0 +1,18 @@
+set(
+  ARGVHELPER_TEST_SOURCES
+  argvHelper_test.cpp
+)
+
+add_executable(ArgvHelperTest ${ARGVHELPER_TEST_SOURCES})
+
+include_directories(
+  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
+)
+
+target_link_libraries(
+  ArgvHelperTest
+
+  ${GTEST_BOTH_LIBRARIES}
+)
+
+add_test(ArgvHelper, ArgvHelperTest)

=== added file 'tests/mirserver/ArgvHelper/argvHelper_test.cpp'
--- tests/mirserver/ArgvHelper/argvHelper_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/mirserver/ArgvHelper/argvHelper_test.cpp	2015-11-17 14:21:31 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtest/gtest.h>
+
+#include <argvHelper.h>
+
+using namespace qtmir;
+
+TEST(ArgvHelperTest, StripsCorrectly)
+{
+    int argc = 5;
+    const char *argv[6] = { "/usr/bin/unity8", "-fullscreen", "--debug",
+                            "--platform-input-lib=/path/to/lib.so", "-testability", nullptr };
+
+    const int filteredArgc = 2;
+    const char *filteredArgv[3] = { "-fullscreen", "-testability", nullptr };
+
+    editArgvToMatch(argc, const_cast<char**>(argv), filteredArgc, filteredArgv);
+
+    EXPECT_EQ(argc, 3);
+    EXPECT_EQ(argv[0], "/usr/bin/unity8");
+    EXPECT_EQ(argv[1], "-fullscreen");
+    EXPECT_EQ(argv[2], "-testability");
+    EXPECT_EQ(argv[3], nullptr);
+}
+
+TEST(ArgvHelperTest, NothingToStrip)
+{
+    int argc = 4;
+    const char *argv[5] = { "/usr/bin/unity8", "-fullscreen", "--multisample", "-testability", nullptr };
+
+    const int filteredArgc = 3;
+    const char *filteredArgv[4] = { "-fullscreen", "-testability", "--multisample", nullptr };
+
+    editArgvToMatch(argc, const_cast<char**>(argv), filteredArgc, filteredArgv);
+
+    EXPECT_EQ(argc, 4);
+    EXPECT_EQ(argv[0], "/usr/bin/unity8");
+    EXPECT_EQ(argv[1], "-fullscreen");
+    EXPECT_EQ(argv[2], "-testability");
+    EXPECT_EQ(argv[3], "--multisample");
+    EXPECT_EQ(argv[4], nullptr);
+}
+
+TEST(ArgvHelperTest, NothingToDo)
+{
+    int argc = 1;
+    const char *argv[2] = { "/usr/bin/unity8", nullptr };
+
+    const int filteredArgc = 0;
+    const char *filteredArgv[1] = { nullptr };
+
+    editArgvToMatch(argc, const_cast<char**>(argv), filteredArgc, filteredArgv);
+
+    EXPECT_EQ(argc, 1);
+    EXPECT_EQ(argv[0], "/usr/bin/unity8");
+    EXPECT_EQ(argv[1], nullptr);
+}

=== modified file 'tests/mirserver/CMakeLists.txt'
--- tests/mirserver/CMakeLists.txt	2015-10-27 10:17:45 +0000
+++ tests/mirserver/CMakeLists.txt	2015-11-17 14:21:31 +0000
@@ -1,3 +1,4 @@
+add_subdirectory(ArgvHelper)
 add_subdirectory(QtEventFeeder)
 add_subdirectory(Clipboard)
 add_subdirectory(Screen)

=== modified file 'tests/modules/common/fake_mirsurface.h'
--- tests/modules/common/fake_mirsurface.h	2015-10-26 18:29:24 +0000
+++ tests/modules/common/fake_mirsurface.h	2015-11-17 14:21:31 +0000
@@ -52,7 +52,6 @@
     FakeMirSurface(QObject *parent = nullptr)
         : MirSurfaceInterface(parent)
         , m_isFirstFrameDrawn(false)
-        , m_session(nullptr)
         , m_isFrameDropperRunning(true)
         , m_live(true)
         , m_state(Mir::RestoredState)
@@ -65,7 +64,7 @@
     // unity.shell.application.MirSurfaceInterface
     Mir::Type type() const override { return Mir::NormalType; }
 
-    QString name() const { return QString("Fake MirSurface"); }
+    QString name() const override { return QString("Fake MirSurface"); }
 
     QSize size() const override { return m_size; }
 
@@ -211,7 +210,6 @@
 
 
     bool m_isFirstFrameDrawn;
-    SessionInterface *m_session;
     bool m_isFrameDropperRunning;
     bool m_live;
     Mir::State m_state;

=== modified file 'tests/modules/common/qtmir_test.h'
--- tests/modules/common/qtmir_test.h	2015-08-20 10:16:54 +0000
+++ tests/modules/common/qtmir_test.h	2015-11-17 14:21:31 +0000
@@ -51,7 +51,7 @@
 void PrintTo(const SessionInterface::State& state, ::std::ostream* os);
 
 // Initialization of mir::Server needed for by tests
-class TestMirServerInit : virtual mir::Server
+class TestMirServerInit : public virtual mir::Server
 {
 public:
     TestMirServerInit()
@@ -72,13 +72,13 @@
 };
 
 
-namespace {  char const* argv[] = { nullptr }; }
+namespace { int argc = 0; char* argv[] = { nullptr }; }
 
 class FakeMirServer: private TestMirServerInit, public MirServer
 {
 public:
     FakeMirServer()
-    : MirServer(0, argv, QSharedPointer<ScreenController>())
+    : MirServer(argc, argv, QSharedPointer<ScreenController>())
     {
     }
 

=== modified file 'tests/modules/common/stub_scene_surface.h'
--- tests/modules/common/stub_scene_surface.h	2015-08-11 12:08:32 +0000
+++ tests/modules/common/stub_scene_surface.h	2015-11-17 14:21:31 +0000
@@ -72,7 +72,7 @@
     void resize(geometry::Size const&) override {}
     void set_transformation(glm::mat4 const&) override {}
     void set_alpha(float) override {}
-    void set_orientation(MirOrientation) {}
+    void set_orientation(MirOrientation) override {}
 
     void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) override {}
     void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) override {}
@@ -80,8 +80,8 @@
     void set_reception_mode(input::InputReceptionMode mode) override { input_mode = mode; }
     void consume(MirEvent const&) override {}
 
-    void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) {}
-    std::shared_ptr<graphics::CursorImage> cursor_image() const { return {}; }
+    void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) override {}
+    std::shared_ptr<graphics::CursorImage> cursor_image() const override { return {}; }
 
     bool supports_input() const override { return true;}
     int client_input_fd() const override { return fd;}