summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/tools/quicklauncher/dropins.h2
-rw-r--r--include.pro2
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
@@ -27,25 +27,25 @@ namespace Opie {
27 */ 27 */
28 QRESULT PluginLoader::queryInterface( const QString& libFile, const QUuid& uuid, QUnknownInterface** iface ) { 28 QRESULT PluginLoader::queryInterface( const QString& libFile, const QUuid& uuid, QUnknownInterface** iface ) {
29 QRESULT res = QS_FALSE; 29 QRESULT res = QS_FALSE;
30 *iface = 0; 30 *iface = 0;
31 31
32 // Below lines from TT then mine again 32 // Below lines from TT then mine again
33 QString name = libFile; 33 QString name = libFile;
34 if ( libFile.findRev(".so") == (int)libFile.length()-3 ) { 34 if ( libFile.findRev(".so") == (int)libFile.length()-3 ) {
35 name = libFile.left( libFile.length()-3 ); 35 name = libFile.left( libFile.length()-3 );
36 if ( name.find( "lib" ) == 0 ) 36 if ( name.find( "lib" ) == 0 )
37 name = name.mid( 3 ); 37 name = name.mid( 3 );
38 } 38 }
39 QString path = QPEApplication::qpeDir() + "/plugins/applications/lib"+name+".so"; 39 QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".so";
40 40
41 QLibrary *lib = new QLibrary( path ); 41 QLibrary *lib = new QLibrary( path );
42 if ( lib->queryInterface( uuid, iface ) == QS_OK && iface ) { 42 if ( lib->queryInterface( uuid, iface ) == QS_OK && iface ) {
43 libs.insert( *iface, lib ); 43 libs.insert( *iface, lib );
44 res = QS_OK; 44 res = QS_OK;
45 } 45 }
46 46
47 return res; 47 return res;
48 } 48 }
49 49
50 void PluginLoader::releaseInterface( QUnknownInterface* iface ) { 50 void PluginLoader::releaseInterface( QUnknownInterface* iface ) {
51 if ( libs.contains( iface ) ) { 51 if ( libs.contains( iface ) ) {
diff --git a/include.pro b/include.pro
index c70c4d5..69fd894 100644
--- a/include.pro
+++ b/include.pro
@@ -1,23 +1,23 @@
1include ( $(OPIEDIR)/gen.pro ) 1include ( $(OPIEDIR)/gen.pro )
2 2
3# make install 3# make install
4 4
5# base opie install path 5# base opie install path
6prefix = /opt/QtPalmtop 6prefix = /opt/QtPalmtop
7 7
8 8
9contains( CONFIG, quick-app-lib ) { 9contains( CONFIG, quick-app-lib ) {
10 TEMPLATE = lib 10 TEMPLATE = lib
11 DESTDIR = $(OPIEDIR)/plugins/applications 11 DESTDIR = $(OPIEDIR)/plugins/application
12 DEFINES += OPIE_APP_INTERFACE 12 DEFINES += OPIE_APP_INTERFACE
13} 13}
14contains ( CONFIG, quick-app-bin ) { 14contains ( CONFIG, quick-app-bin ) {
15 TEMPLATE = app 15 TEMPLATE = app
16 DESTDIR = $(OPIEDIR)/bin 16 DESTDIR = $(OPIEDIR)/bin
17 DEFINES -= OPIE_APP_INTERFACE 17 DEFINES -= OPIE_APP_INTERFACE
18} 18}
19 19
20 20
21contains( TEMPLATE, lib ) { 21contains( TEMPLATE, lib ) {
22 target.path = $$prefix/lib 22 target.path = $$prefix/lib
23} 23}