| -rw-r--r-- | core/tools/quicklauncher/dropins.h | 2 | ||||
| -rw-r--r-- | include.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/tools/quicklauncher/dropins.h b/core/tools/quicklauncher/dropins.h index ac8d8cc..fe43ec2 100644 --- a/core/tools/quicklauncher/dropins.h +++ b/core/tools/quicklauncher/dropins.h @@ -15,47 +15,47 @@ namespace Opie { struct PluginLoader { PluginLoader( const char* ) { } QRESULT queryInterface( const QString& app, const QUuid&, QUnknownInterface** ); 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; // 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 ); } - QString path = QPEApplication::qpeDir() + "/plugins/applications/lib"+name+".so"; + QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".so"; 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 ) ) { iface->release(); delete libs[iface]; libs.remove( iface ); // we only handle pointers so even if the object is not valid the address-space is } } } /* small hack ;) */ using namespace Opie; diff --git a/include.pro b/include.pro index c70c4d5..69fd894 100644 --- a/include.pro +++ b/include.pro @@ -1,35 +1,35 @@ include ( $(OPIEDIR)/gen.pro ) # make install # base opie install path prefix = /opt/QtPalmtop contains( CONFIG, quick-app-lib ) { TEMPLATE = lib - DESTDIR = $(OPIEDIR)/plugins/applications + DESTDIR = $(OPIEDIR)/plugins/application DEFINES += OPIE_APP_INTERFACE } contains ( CONFIG, quick-app-bin ) { TEMPLATE = app DESTDIR = $(OPIEDIR)/bin DEFINES -= OPIE_APP_INTERFACE } contains( TEMPLATE, lib ) { target.path = $$prefix/lib } !contains( TEMPLATE, lib ) { target.path = $$prefix/bin } INSTALLS += target # ipkg control files control.path = /CONTROL control.files = control postinst prerm postrm preinst conffiles INSTALLS += control # images, default is $$prefix/pics/$$TARGET pics.path = $$prefix/pics/$$TARGET |