Fixing the ".so" stuff for MacOS-X .. Quicklauncher apps are now

loaded successfully..

1 files changed, 9 insertions, 0 deletions

diff --git a/core/tools/quicklauncher/dropins.h b/core/tools/quicklauncher/dropins.h
index fe43ec2..3e2b5fd 100644
--- a/core/tools/quicklauncher/dropins.h
+++ b/core/tools/quicklauncher/dropins.h
@@ -20,32 +20,41 @@ namespace Opie {
         void releaseInterface( QUnknownInterface* );
         QMap<QUnknownInterface*, QLibrary*> libs;
     };
 
     /*
      * We can skip installing a Translator here because Opies QPEApplication
      * will do that in initApp for us as well
      */
     QRESULT PluginLoader::queryInterface( const QString& libFile, const QUuid& uuid, QUnknownInterface** iface ) {
         QRESULT res = QS_FALSE;
         *iface = 0;
 
+	// This code is very platform specific.. We should find better
+	// solutions to handle names.. Maybe one central function would be
+	// better than checking this ".so" stuff all around in the sources.. 
+	// (eilers)
+
         // Below lines from TT then mine again
         QString name = libFile;
         if ( libFile.findRev(".so") == (int)libFile.length()-3 ) {
             name = libFile.left( libFile.length()-3 );
             if ( name.find( "lib" ) == 0 )
                 name = name.mid( 3 );
         }
+#ifdef Q_OS_MACX
+        QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".dylib";
+#else
         QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".so";
+#endif
 
         QLibrary *lib = new QLibrary( path );
         if ( lib->queryInterface( uuid, iface ) == QS_OK && iface ) {
             libs.insert( *iface, lib );
             res = QS_OK;
         }
 
         return res;
     }
 
     void PluginLoader::releaseInterface( QUnknownInterface* iface ) {
         if ( libs.contains( iface ) ) {