Fixes: Bug 247707 - Invoker interferes with qttas plugin loading for qml applications

Details: Testability enabling with the QT_LOAD_TESTABILITY environment variable was not working.
RevBy: Olli Leppänen

debian/changelog

@@ -1,3 +1,9 @@
+applauncherd (0.29.9) unstable; urgency=low
+
+  * Fixes: NB#247707 - Invoker interferes with qttas plugin loading for qml applications
+
+ -- Pertti Kellomaki <pertti.kellomaki@nokia.com>  Wed, 25 May 2011 14:18:05 +0300
+
 applauncherd (0.29.8) stable; urgency=low
 
   * Fixes: NB#231286 - Launcher daemon doesn't link the libraries so that they could be prelinked

src/qdeclarativebooster/mdeclarativecache.cpp

@@ -33,10 +33,6 @@
 
 #include "coverage.h"
 
-// Environment
-extern char ** environ;
-
-
 MDeclarativeCachePrivate * const MDeclarativeCache::d_ptr = new MDeclarativeCachePrivate;
 const int MDeclarativeCachePrivate::ARGV_LIMIT = 32;
 
@@ -128,17 +124,8 @@ QApplication* MDeclarativeCachePrivate::qApplication(int &argc, char **argv)
             }
         }
 
-        bool loadTestabilityEnv = false;
-        const char* testabilityEnv = "QT_LOAD_TESTABILITY";
-        for (int i = 0; environ[i] != NULL; i++) 
-        {
-            if (strcmp(environ[i], testabilityEnv) == 0)
-            {
-                loadTestabilityEnv = true;
-                break;
-            }
-        }
         
+        bool loadTestabilityEnv = !qgetenv("QT_LOAD_TESTABILITY").isNull();
         if (loadTestabilityEnv || loadTestabilityArg)
             testabilityInit();