author | eilers <eilers> | 2003-11-17 16:02:31 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-11-17 16:02:31 (UTC) |
commit | 74a1afb21424a4f69c7a01fda2cc517daf69fd82 (patch) (unidiff) | |
tree | ff509880b5c14281bbb2bb05a6519bf081612525 | |
parent | e206333876a37ae188fe2889bb079158611cebe3 (diff) | |
download | opie-74a1afb21424a4f69c7a01fda2cc517daf69fd82.zip opie-74a1afb21424a4f69c7a01fda2cc517daf69fd82.tar.gz opie-74a1afb21424a4f69c7a01fda2cc517daf69fd82.tar.bz2 |
Fixing the ".so" stuff for MacOS-X .. Quicklauncher apps are now
loaded successfully..
-rw-r--r-- | core/tools/quicklauncher/dropins.h | 9 |
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 | |||
@@ -29,6 +29,11 @@ namespace Opie { | |||
29 | QRESULT res = QS_FALSE; | 29 | QRESULT res = QS_FALSE; |
30 | *iface = 0; | 30 | *iface = 0; |
31 | 31 | ||
32 | // This code is very platform specific.. We should find better | ||
33 | // solutions to handle names.. Maybe one central function would be | ||
34 | // better than checking this ".so" stuff all around in the sources.. | ||
35 | // (eilers) | ||
36 | |||
32 | // Below lines from TT then mine again | 37 | // Below lines from TT then mine again |
33 | QString name = libFile; | 38 | QString name = libFile; |
34 | if ( libFile.findRev(".so") == (int)libFile.length()-3 ) { | 39 | if ( libFile.findRev(".so") == (int)libFile.length()-3 ) { |
@@ -36,7 +41,11 @@ namespace Opie { | |||
36 | if ( name.find( "lib" ) == 0 ) | 41 | if ( name.find( "lib" ) == 0 ) |
37 | name = name.mid( 3 ); | 42 | name = name.mid( 3 ); |
38 | } | 43 | } |
44 | #ifdef Q_OS_MACX | ||
45 | QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".dylib"; | ||
46 | #else | ||
39 | QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".so"; | 47 | QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".so"; |
48 | #endif | ||
40 | 49 | ||
41 | QLibrary *lib = new QLibrary( path ); | 50 | QLibrary *lib = new QLibrary( path ); |
42 | if ( lib->queryInterface( uuid, iface ) == QS_OK && iface ) { | 51 | if ( lib->queryInterface( uuid, iface ) == QS_OK && iface ) { |