Merge lp:~mikemc/ubuntu-sso-client/fix-1010102 into lp:ubuntu-sso-client

[Mike McCracken]

- fixes bug with loading incorrect plugins caused by ignoring qt.conf ( LP #1010102 )

- fixes bug with loading incorrect plugins caused by ignoring qt.conf ( LP #1010102 )

Long description for short change:

The QApplication instance created in the ubuntu-sso-login is not retained, so it is garbage collected before the search for qt.conf happens.

The qt.conf search code uses the existence of a QApplication to tell if it should look for qt.conf in the application bundle, so the result is that it doesn't find a qt.conf, uses the default plugin search path, and loads plugins that link to the system Qt libraries instead of the bundled ones, which is bad.

[Roberto Alsina (ralsina)]

+1 trivial

review: Approve

[lp:~mikemc/ubuntu-sso-client/fix-1010102]

965. By Mike McCracken on 2012-06-07

- fixes bug with loading incorrect plugins caused by ignoring qt.conf ( LP #1010102 )

=== modified file 'bin/ubuntu-sso-login'
--- bin/ubuntu-sso-login	2012-05-18 14:25:49 +0000
+++ bin/ubuntu-sso-login	2012-06-07 17:37:24 +0000
@@ -57,7 +57,7 @@
     # need to create the QApplication before installing the reactor
     if os.environ.get('TESTABILITY', False):
         sys.argv.append('-testability')
-    QtGui.QApplication(sys.argv)
+    app = QtGui.QApplication(sys.argv)
 
     # pylint: disable=F0401
     import qt4reactor