author | zecke <zecke> | 2003-08-27 13:03:26 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-08-27 13:03:26 (UTC) |
commit | 2635bf400cb58c11f48477150d6fc4337de12fb0 (patch) (unidiff) | |
tree | c9fd9cc0401337e7329dd104fc1e7d3fcef4e93d | |
parent | 38538a71248a16ff964870909965cf233c796bf5 (diff) | |
download | opie-2635bf400cb58c11f48477150d6fc4337de12fb0.zip opie-2635bf400cb58c11f48477150d6fc4337de12fb0.tar.gz opie-2635bf400cb58c11f48477150d6fc4337de12fb0.tar.bz2 |
Fix path
it's application not applications
-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 | |||
@@ -1,61 +1,61 @@ | |||
1 | 1 | ||
2 | #include <qstring.h> | 2 | #include <qstring.h> |
3 | #include <qtopia/qcom.h> | 3 | #include <qtopia/qcom.h> |
4 | #include <qtopia/qlibrary.h> | 4 | #include <qtopia/qlibrary.h> |
5 | #include <qtopia/applicationinterface.h> | 5 | #include <qtopia/applicationinterface.h> |
6 | #include <qtopia/resource.h> | 6 | #include <qtopia/resource.h> |
7 | 7 | ||
8 | #include <opie/owait.h> | 8 | #include <opie/owait.h> |
9 | 9 | ||
10 | #include <qmetaobject.h> | 10 | #include <qmetaobject.h> |
11 | #include <qmap.h> | 11 | #include <qmap.h> |
12 | 12 | ||
13 | namespace Opie { | 13 | namespace Opie { |
14 | 14 | ||
15 | struct PluginLoader { | 15 | struct PluginLoader { |
16 | PluginLoader( const char* ) { | 16 | PluginLoader( const char* ) { |
17 | } | 17 | } |
18 | 18 | ||
19 | QRESULT queryInterface( const QString& app, const QUuid&, QUnknownInterface** ); | 19 | QRESULT queryInterface( const QString& app, const QUuid&, QUnknownInterface** ); |
20 | void releaseInterface( QUnknownInterface* ); | 20 | void releaseInterface( QUnknownInterface* ); |
21 | QMap<QUnknownInterface*, QLibrary*> libs; | 21 | QMap<QUnknownInterface*, QLibrary*> libs; |
22 | }; | 22 | }; |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * We can skip installing a Translator here because Opies QPEApplication | 25 | * We can skip installing a Translator here because Opies QPEApplication |
26 | * will do that in initApp for us as well | 26 | * will do that in initApp for us as well |
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 ) ) { |
52 | iface->release(); | 52 | iface->release(); |
53 | delete libs[iface]; | 53 | delete libs[iface]; |
54 | libs.remove( iface ); // we only handle pointers so even if the object is not valid the address-space is | 54 | libs.remove( iface ); // we only handle pointers so even if the object is not valid the address-space is |
55 | } | 55 | } |
56 | } | 56 | } |
57 | 57 | ||
58 | } | 58 | } |
59 | 59 | ||
60 | /* small hack ;) */ | 60 | /* small hack ;) */ |
61 | using namespace Opie; | 61 | using namespace Opie; |
diff --git a/include.pro b/include.pro index c70c4d5..69fd894 100644 --- a/include.pro +++ b/include.pro | |||
@@ -1,96 +1,96 @@ | |||
1 | include ( $(OPIEDIR)/gen.pro ) | 1 | include ( $(OPIEDIR)/gen.pro ) |
2 | 2 | ||
3 | # make install | 3 | # make install |
4 | 4 | ||
5 | # base opie install path | 5 | # base opie install path |
6 | prefix = /opt/QtPalmtop | 6 | prefix = /opt/QtPalmtop |
7 | 7 | ||
8 | 8 | ||
9 | contains( CONFIG, quick-app-lib ) { | 9 | contains( 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 | } |
14 | contains ( CONFIG, quick-app-bin ) { | 14 | contains ( 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 | ||
21 | contains( TEMPLATE, lib ) { | 21 | contains( TEMPLATE, lib ) { |
22 | target.path = $$prefix/lib | 22 | target.path = $$prefix/lib |
23 | } | 23 | } |
24 | !contains( TEMPLATE, lib ) { | 24 | !contains( TEMPLATE, lib ) { |
25 | target.path = $$prefix/bin | 25 | target.path = $$prefix/bin |
26 | } | 26 | } |
27 | INSTALLS += target | 27 | INSTALLS += target |
28 | 28 | ||
29 | # ipkg control files | 29 | # ipkg control files |
30 | control.path = /CONTROL | 30 | control.path = /CONTROL |
31 | control.files = control postinst prerm postrm preinst conffiles | 31 | control.files = control postinst prerm postrm preinst conffiles |
32 | INSTALLS += control | 32 | INSTALLS += control |
33 | 33 | ||
34 | # images, default is $$prefix/pics/$$TARGET | 34 | # images, default is $$prefix/pics/$$TARGET |
35 | pics.path = $$prefix/pics/$$TARGET | 35 | pics.path = $$prefix/pics/$$TARGET |
36 | pics.files = pics/* | 36 | pics.files = pics/* |
37 | INSTALLS += pics | 37 | INSTALLS += pics |
38 | 38 | ||
39 | # sounds, default path is $$prefix/sounds/$$TARGET | 39 | # sounds, default path is $$prefix/sounds/$$TARGET |
40 | sounds.path = $$prefix/sounds/$$TARGET | 40 | sounds.path = $$prefix/sounds/$$TARGET |
41 | sounds.files = sounds/* | 41 | sounds.files = sounds/* |
42 | INSTALLS += sounds | 42 | INSTALLS += sounds |
43 | 43 | ||
44 | # init scripts, default path is /etc/init.d | 44 | # init scripts, default path is /etc/init.d |
45 | init.path = /etc/init.d | 45 | init.path = /etc/init.d |
46 | init.files = init.d/* | 46 | init.files = init.d/* |
47 | INSTALLS += init | 47 | INSTALLS += init |
48 | 48 | ||
49 | # data, default path is /usr/share/$$TARGET | 49 | # data, default path is /usr/share/$$TARGET |
50 | data.path = /usr/share/$$TARGET | 50 | data.path = /usr/share/$$TARGET |
51 | data.files = share/* | 51 | data.files = share/* |
52 | INSTALLS += data | 52 | INSTALLS += data |
53 | 53 | ||
54 | etc.path = $$prefix/etc/ | 54 | etc.path = $$prefix/etc/ |
55 | etc.files = etc/* | 55 | etc.files = etc/* |
56 | INSTALLS += etc | 56 | INSTALLS += etc |
57 | 57 | ||
58 | apps.path = $$prefix/apps/ | 58 | apps.path = $$prefix/apps/ |
59 | apps.files = apps/* | 59 | apps.files = apps/* |
60 | INSTALLS += apps | 60 | INSTALLS += apps |
61 | 61 | ||
62 | # sounds, default path is $$prefix/sounds/$$TARGET | 62 | # sounds, default path is $$prefix/sounds/$$TARGET |
63 | sounds.path = $$prefix/sounds/$$TARGET | 63 | sounds.path = $$prefix/sounds/$$TARGET |
64 | sounds.files = sounds/* | 64 | sounds.files = sounds/* |
65 | INSTALLS += sounds | 65 | INSTALLS += sounds |
66 | 66 | ||
67 | # anything in nonstandard paths | 67 | # anything in nonstandard paths |
68 | root.path = / | 68 | root.path = / |
69 | root.files = root/* | 69 | root.files = root/* |
70 | INSTALLS += root | 70 | INSTALLS += root |
71 | 71 | ||
72 | # new targets | 72 | # new targets |
73 | opie-lupdate.target = opie-lupdate | 73 | opie-lupdate.target = opie-lupdate |
74 | opie-lupdate.commands = opie-lupdate -noobsolete $(PRO) | 74 | opie-lupdate.commands = opie-lupdate -noobsolete $(PRO) |
75 | 75 | ||
76 | opie-lrelease.target = opie-lrelease | 76 | opie-lrelease.target = opie-lrelease |
77 | opie-lrelease.commands = opie-lrelease $(PRO) | 77 | opie-lrelease.commands = opie-lrelease $(PRO) |
78 | 78 | ||
79 | lupdate.target = lupdate | 79 | lupdate.target = lupdate |
80 | lupdate.commands = lupdate -noobsolete $(PRO) | 80 | lupdate.commands = lupdate -noobsolete $(PRO) |
81 | 81 | ||
82 | lrelease.target = lrelease | 82 | lrelease.target = lrelease |
83 | lrelease.commands = lrelease $(PRO) | 83 | lrelease.commands = lrelease $(PRO) |
84 | 84 | ||
85 | ipk.target = ipk | 85 | ipk.target = ipk |
86 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 86 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
87 | 87 | ||
88 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease | 88 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease |
89 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 89 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
90 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 90 | QMAKE_LIBDIR += $(OPIEDIR)/lib |
91 | 91 | ||
92 | MOC_DIR=.moc/$(PLATFORM) | 92 | MOC_DIR=.moc/$(PLATFORM) |
93 | OBJECTS_DIR=.obj/$(PLATFORM) | 93 | OBJECTS_DIR=.obj/$(PLATFORM) |
94 | 94 | ||
95 | #was here now at thetop | 95 | #was here now at thetop |
96 | #include ( $(OPIEDIR)/gen.pro ) | 96 | #include ( $(OPIEDIR)/gen.pro ) |