-rw-r--r-- | include.pro | 14 | ||||
-rw-r--r-- | libopie2/opiecore/opiecore.pro | 3 | ||||
-rw-r--r-- | library/qlibrary_unix.cpp | 2 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/include.pro b/include.pro index f32786a..dd388f2 100644 --- a/include.pro +++ b/include.pro | |||
@@ -91,46 +91,46 @@ lupdate.commands = lupdate -noobsolete $(PRO) | |||
91 | 91 | ||
92 | lrelease.target = lrelease | 92 | lrelease.target = lrelease |
93 | lrelease.commands = lrelease $(PRO) | 93 | lrelease.commands = lrelease $(PRO) |
94 | 94 | ||
95 | # new message target to get all strings from the apps with and without tr | 95 | # new message target to get all strings from the apps with and without tr |
96 | messages.target = messages | 96 | messages.target = messages |
97 | messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po' | 97 | messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po' |
98 | 98 | ||
99 | ipk.target = ipk | 99 | ipk.target = ipk |
100 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 100 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
101 | 101 | ||
102 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages | 102 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages |
103 | 103 | ||
104 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 104 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
105 | contains( CONFTEST, y ){ | 105 | contains( CONFTEST, y ){ |
106 | QMAKE_LFLAGS += -Wl | 106 | QMAKE_LFLAGS += -Wl |
107 | LIBS -= -ldl | 107 | LIBS -= -ldl |
108 | LIBS -= -lcrypt | 108 | LIBS -= -lcrypt |
109 | LIBS -= -lm | 109 | LIBS -= -lm |
110 | 110 | ||
111 | # Manual including indirect referenced libraries which are not loaded | 111 | # Manual including indirect referenced libraries which are not loaded |
112 | # by the mac-linker automatically | 112 | # by the mac-linker automatically |
113 | # IF YOU COMPILE FOR THE FIRST TIME, COMMENT OUT ONE OF THE FOLLOWING | 113 | # IF YOU COMPILE FOR THE FIRST TIME, COMMENT OUT ONE OF THE FOLLOWING |
114 | # (regarding whether you activate SQL) and the last one (-lopiecore2) | 114 | # (regarding whether you activate SQL) and the last one (-lopiecore2) |
115 | CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) | 115 | #CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) |
116 | contains( CONFTEST, y ){ | 116 | #contains( CONFTEST, y ){ |
117 | LIBS += -lopiedb2 -lqpe | 117 | # LIBS += -lopiedb2 -lqpe |
118 | } else { | 118 | #} else { |
119 | LIBS += -lqpe | 119 | # LIBS += -lqpe |
120 | } | 120 | #} |
121 | LIBS += -lopiecore2 | 121 | #LIBS += -lopiecore2 |
122 | } | 122 | } |
123 | else { | 123 | else { |
124 | 124 | ||
125 | QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib | 125 | QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib |
126 | # I am not sure whether it is a good idea to change the way plugins is build | 126 | # I am not sure whether it is a good idea to change the way plugins is build |
127 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X | 127 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X |
128 | CONFIG -= plugin | 128 | CONFIG -= plugin |
129 | } | 129 | } |
130 | LIBS += -L$(OPIEDIR)/lib | 130 | LIBS += -L$(OPIEDIR)/lib |
131 | 131 | ||
132 | MOC_DIR=.moc/$(PLATFORM) | 132 | MOC_DIR=.moc/$(PLATFORM) |
133 | OBJECTS_DIR=.obj/$(PLATFORM) | 133 | OBJECTS_DIR=.obj/$(PLATFORM) |
134 | 134 | ||
135 | #was here now at thetop | 135 | #was here now at thetop |
136 | #include( $(OPIEDIR)/gen.pro ) | 136 | #include( $(OPIEDIR)/gen.pro ) |
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro index cbb7e04..3406b8f 100644 --- a/libopie2/opiecore/opiecore.pro +++ b/libopie2/opiecore/opiecore.pro | |||
@@ -13,47 +13,48 @@ HEADERS = oapplication.h \ | |||
13 | oprocctrl.h \ | 13 | oprocctrl.h \ |
14 | oresource.h \ | 14 | oresource.h \ |
15 | osharedpointer.h \ | 15 | osharedpointer.h \ |
16 | osmartpointer.h \ | 16 | osmartpointer.h \ |
17 | ostorageinfo.h \ | 17 | ostorageinfo.h \ |
18 | xmltree.h | 18 | xmltree.h |
19 | 19 | ||
20 | SOURCES = oapplication.cpp \ | 20 | SOURCES = oapplication.cpp \ |
21 | oconfig.cpp \ | 21 | oconfig.cpp \ |
22 | odebug.cpp \ | 22 | odebug.cpp \ |
23 | oglobal.cpp \ | 23 | oglobal.cpp \ |
24 | oglobalsettings.cpp \ | 24 | oglobalsettings.cpp \ |
25 | okeyconfigmanager.cpp \ | 25 | okeyconfigmanager.cpp \ |
26 | okeyfilter.cpp \ | 26 | okeyfilter.cpp \ |
27 | opluginloader.cpp \ | 27 | opluginloader.cpp \ |
28 | oprocess.cpp \ | 28 | oprocess.cpp \ |
29 | oprocctrl.cpp \ | 29 | oprocctrl.cpp \ |
30 | oresource.cpp \ | 30 | oresource.cpp \ |
31 | osmartpointer.cpp \ | 31 | osmartpointer.cpp \ |
32 | ostorageinfo.cpp \ | 32 | ostorageinfo.cpp \ |
33 | xmltree.cpp | 33 | xmltree.cpp |
34 | 34 | ||
35 | 35 | ||
36 | # Disable Linux-only subsystems for MAC build | 36 | # Disable Linux-only subsystems for MAC build |
37 | !contains( CONFIG_TARGET_MACOSX, y ) { | 37 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
38 | !contains( CONFTEST, y ) { | ||
38 | include ( linux/linux.pro ) | 39 | include ( linux/linux.pro ) |
39 | } else { | 40 | } else { |
40 | message( "disabling linux-only subsystems for MAC build" ) | 41 | message( "disabling linux-only subsystems for MAC build" ) |
41 | } | 42 | } |
42 | 43 | ||
43 | include( device/device.pro ) | 44 | include( device/device.pro ) |
44 | 45 | ||
45 | INTERFACES = | 46 | INTERFACES = |
46 | TARGET = opiecore2 | 47 | TARGET = opiecore2 |
47 | VERSION = 1.9.4 | 48 | VERSION = 1.9.4 |
48 | INCLUDEPATH += $(OPIEDIR)/include | 49 | INCLUDEPATH += $(OPIEDIR)/include |
49 | DEPENDPATH += $(OPIEDIR)/include | 50 | DEPENDPATH += $(OPIEDIR)/include |
50 | 51 | ||
51 | !contains( platform, x11 ) { | 52 | !contains( platform, x11 ) { |
52 | LIBS = -lqpe | 53 | LIBS = -lqpe |
53 | include( $(OPIEDIR)/include.pro ) | 54 | include( $(OPIEDIR)/include.pro ) |
54 | } | 55 | } |
55 | 56 | ||
56 | contains( platform, x11 ) { | 57 | contains( platform, x11 ) { |
57 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 58 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
58 | } | 59 | } |
59 | 60 | ||
diff --git a/library/qlibrary_unix.cpp b/library/qlibrary_unix.cpp index 2181153..fee73c2 100644 --- a/library/qlibrary_unix.cpp +++ b/library/qlibrary_unix.cpp | |||
@@ -132,49 +132,49 @@ bool QLibraryPrivate::loadLibrary() | |||
132 | qWarning( "Error in NSLinkModule()" ); | 132 | qWarning( "Error in NSLinkModule()" ); |
133 | NSDestroyObjectFileImage(img); | 133 | NSDestroyObjectFileImage(img); |
134 | } | 134 | } |
135 | } | 135 | } |
136 | DyldLibDesc* desc = 0; | 136 | DyldLibDesc* desc = 0; |
137 | if (img != 0 && mod != 0) { | 137 | if (img != 0 && mod != 0) { |
138 | desc = new DyldLibDesc; | 138 | desc = new DyldLibDesc; |
139 | desc->img = img; | 139 | desc->img = img; |
140 | desc->mod = mod; | 140 | desc->mod = mod; |
141 | } | 141 | } |
142 | pHnd = desc; | 142 | pHnd = desc; |
143 | return pHnd != 0; | 143 | return pHnd != 0; |
144 | } | 144 | } |
145 | 145 | ||
146 | bool QLibraryPrivate::freeLibrary() | 146 | bool QLibraryPrivate::freeLibrary() |
147 | { | 147 | { |
148 | //qDebug("QLibraryPrivate::freeLibrary\n"); | 148 | //qDebug("QLibraryPrivate::freeLibrary\n"); |
149 | //return FALSE; | 149 | //return FALSE; |
150 | if ( !pHnd ) | 150 | if ( !pHnd ) |
151 | return TRUE; | 151 | return TRUE; |
152 | 152 | ||
153 | DyldLibDesc* desc = (DyldLibDesc*) pHnd; | 153 | DyldLibDesc* desc = (DyldLibDesc*) pHnd; |
154 | NSModule mod = desc->mod; | 154 | NSModule mod = desc->mod; |
155 | NSObjectFileImage img = desc->img; | 155 | NSObjectFileImage img = desc->img; |
156 | DYLD_BOOL success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE); | 156 | bool success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE); |
157 | if ( success ) { | 157 | if ( success ) { |
158 | NSDestroyObjectFileImage(img); | 158 | NSDestroyObjectFileImage(img); |
159 | delete desc; | 159 | delete desc; |
160 | pHnd = 0; | 160 | pHnd = 0; |
161 | } | 161 | } |
162 | #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) | 162 | #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) |
163 | else { | 163 | else { |
164 | qWarning( "Error in NSUnLinkModule()" ); | 164 | qWarning( "Error in NSUnLinkModule()" ); |
165 | } | 165 | } |
166 | #endif | 166 | #endif |
167 | return pHnd == 0; | 167 | return pHnd == 0; |
168 | } | 168 | } |
169 | 169 | ||
170 | void* QLibraryPrivate::resolveSymbol( const char* symbol ) | 170 | void* QLibraryPrivate::resolveSymbol( const char* symbol ) |
171 | { | 171 | { |
172 | //qDebug("QLibraryPrivate::resolveSymbol\n"); | 172 | //qDebug("QLibraryPrivate::resolveSymbol\n"); |
173 | //return FALSE; | 173 | //return FALSE; |
174 | if ( !pHnd ) | 174 | if ( !pHnd ) |
175 | return 0; | 175 | return 0; |
176 | 176 | ||
177 | DyldLibDesc* desc = (DyldLibDesc*) pHnd; | 177 | DyldLibDesc* desc = (DyldLibDesc*) pHnd; |
178 | NSSymbol sym = NSLookupSymbolInModule(desc->mod, symbol); | 178 | NSSymbol sym = NSLookupSymbolInModule(desc->mod, symbol); |
179 | void* address = 0; | 179 | void* address = 0; |
180 | if (sym != 0) { | 180 | if (sym != 0) { |
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 19e99f2..dcc1001 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -2186,49 +2186,49 @@ void QPEApplication::tryQuit() | |||
2186 | hiding the window. If not it means quitting the application. | 2186 | hiding the window. If not it means quitting the application. |
2187 | As this is user initiated we don't need to check state. | 2187 | As this is user initiated we don't need to check state. |
2188 | */ | 2188 | */ |
2189 | void QPEApplication::hideOrQuit() | 2189 | void QPEApplication::hideOrQuit() |
2190 | { | 2190 | { |
2191 | if ( d->keep_running ) | 2191 | if ( d->keep_running ) |
2192 | d->store_widget_rect(d->qpe_main_widget, d->appName); | 2192 | d->store_widget_rect(d->qpe_main_widget, d->appName); |
2193 | processEvents(); | 2193 | processEvents(); |
2194 | 2194 | ||
2195 | // If we are a preloaded application we don't actually quit, so emit | 2195 | // If we are a preloaded application we don't actually quit, so emit |
2196 | // a System message indicating we're quasi-closing. | 2196 | // a System message indicating we're quasi-closing. |
2197 | if ( d->preloaded && d->qpe_main_widget ) | 2197 | if ( d->preloaded && d->qpe_main_widget ) |
2198 | #ifndef QT_NO_COP | 2198 | #ifndef QT_NO_COP |
2199 | 2199 | ||
2200 | { | 2200 | { |
2201 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); | 2201 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); |
2202 | e << d->appName; | 2202 | e << d->appName; |
2203 | d->qpe_main_widget->hide(); | 2203 | d->qpe_main_widget->hide(); |
2204 | } | 2204 | } |
2205 | #endif | 2205 | #endif |
2206 | else | 2206 | else |
2207 | quit(); | 2207 | quit(); |
2208 | } | 2208 | } |
2209 | 2209 | ||
2210 | #if (__GNUC__ > 2 ) | 2210 | #if (__GNUC__ > 2 ) && !defined(_OS_MACX_) |
2211 | extern "C" void __cxa_pure_virtual(); | 2211 | extern "C" void __cxa_pure_virtual(); |
2212 | 2212 | ||
2213 | void __cxa_pure_virtual() | 2213 | void __cxa_pure_virtual() |
2214 | { | 2214 | { |
2215 | fprintf( stderr, "Pure virtual called\n"); | 2215 | fprintf( stderr, "Pure virtual called\n"); |
2216 | abort(); | 2216 | abort(); |
2217 | 2217 | ||
2218 | } | 2218 | } |
2219 | 2219 | ||
2220 | #endif | 2220 | #endif |
2221 | 2221 | ||
2222 | 2222 | ||
2223 | #if defined(OPIE_NEW_MALLOC) | 2223 | #if defined(OPIE_NEW_MALLOC) |
2224 | 2224 | ||
2225 | // The libraries with the skiff package (and possibly others) have | 2225 | // The libraries with the skiff package (and possibly others) have |
2226 | // completely useless implementations of builtin new and delete that | 2226 | // completely useless implementations of builtin new and delete that |
2227 | // use about 50% of your CPU. Here we revert to the simple libc | 2227 | // use about 50% of your CPU. Here we revert to the simple libc |
2228 | // functions. | 2228 | // functions. |
2229 | 2229 | ||
2230 | void* operator new[]( size_t size ) | 2230 | void* operator new[]( size_t size ) |
2231 | { | 2231 | { |
2232 | return malloc( size ); | 2232 | return malloc( size ); |
2233 | } | 2233 | } |
2234 | 2234 | ||