@@ -91,7 +91,7 @@ int startShell(int argc, const char** argv, void* server)
91 QGuiApplication::setApplicationName("Unity 8");
91 QGuiApplication::setApplicationName("Unity 8");
92 QGuiApplication *application;
92 QGuiApplication *application;
93 if (isUbuntuMirServer) {
93 if (isUbuntuMirServer) {
94− QLibrary unityMir("/usr/lib/arm-linux-gnueabihf/libunity-mir.so.1.0.0");
94+ QLibrary unityMir("unity-mir");
95 unityMir.load();
95 unityMir.load();
97 typedef QGuiApplication* (*createServerApplication_t)(int&, const char **, void*);
97 typedef QGuiApplication* (*createServerApplication_t)(int&, const char **, void*);
@@ -190,11 +190,10 @@ int main(int argc, const char *argv[])
190 if (qgetenv("QT_QPA_PLATFORM").startsWith("ubuntumir")) {
190 if (qgetenv("QT_QPA_PLATFORM").startsWith("ubuntumir")) {
191 setenv("QT_QPA_PLATFORM", "ubuntumirserver", 1);
191 setenv("QT_QPA_PLATFORM", "ubuntumirserver", 1);
193− // if we use unity-mir directly, we link straight to mirserver, which exports
193+ // If we use unity-mir directly, we automatically link to the Mir-server
194− // the same symbols as qtubuntu, so if running on SF, the linker finds the mir
194+ // platform-api bindings, which result in unexpected behaviour when
195− // symbols first and uses them! Crash!
195+ // running the non-Mir scenario.
196− // load the triangle library
197− QLibrary unityMir("/usr/lib/arm-linux-gnueabihf/libunity-mir.so.1.0.0");
196+ QLibrary unityMir("unity-mir");
198 unityMir.load();
197 unityMir.load();
199 if (!unityMir.isLoaded()) {
198 if (!unityMir.isLoaded()) {
200 qDebug() << "Library unity-mir not found/loaded";
199 qDebug() << "Library unity-mir not found/loaded";