c619b02 · unity8 · git.iko.soy

git.iko.soy/unity8

Mir loading fixes and AP test breakage

* Specify major version of unity-mir to load on demand * Stop blocking input during the animation of the hud button

commitc619b020aacee96885a2967e86fb406eda243605 authorRicardo Mendoza <ricardo.mendoza@canonical.com> dateThu 12 Sep 2013, 00:51 (13 years ago) parent799aff2

2 files changed+3−3

compare with xenial

unifiedsplit

Bottombar/Bottombar.qml+1−1 main.cpp+2−2

Bottombar/Bottombar.qml+1−1

@@ -144,7 +144,7 @@ Item {

144144

145145 InputFilterArea {

146146 anchors.fill: parent

147− blockInput: hudButton.visible

147+ blockInput: (hudButton.opacity == 1)

148148 }

149149

150150 states: [

main.cpp+2−2

@@ -91,7 +91,7 @@ int startShell(int argc, const char** argv, void* server)

9191 QGuiApplication::setApplicationName("Unity 8");

9292 QGuiApplication *application;

9393 if (isUbuntuMirServer) {

94− QLibrary unityMir("unity-mir");

94+ QLibrary unityMir("unity-mir", 1);

9595 unityMir.load();

9696

9797 typedef QGuiApplication* (*createServerApplication_t)(int&, const char **, void*);

@@ -193,7 +193,7 @@ int main(int argc, const char *argv[])

193193 // If we use unity-mir directly, we automatically link to the Mir-server

194194 // platform-api bindings, which result in unexpected behaviour when

195195 // running the non-Mir scenario.

196− QLibrary unityMir("unity-mir");

196+ QLibrary unityMir("unity-mir", 1);

197197 unityMir.load();

198198 if (!unityMir.isLoaded()) {

199199 qDebug() << "Library unity-mir not found/loaded";