summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--include.pro14
-rw-r--r--libopie2/opiecore/opiecore.pro3
-rw-r--r--library/qlibrary_unix.cpp2
-rw-r--r--library/qpeapplication.cpp2
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
@@ -107,23 +107,23 @@ contains( CONFTEST, y ){
LIBS -= -ldl
LIBS -= -lcrypt
LIBS -= -lm
# Manual including indirect referenced libraries which are not loaded
# by the mac-linker automatically
# IF YOU COMPILE FOR THE FIRST TIME, COMMENT OUT ONE OF THE FOLLOWING
# (regarding whether you activate SQL) and the last one (-lopiecore2)
- CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
- contains( CONFTEST, y ){
- LIBS += -lopiedb2 -lqpe
- } else {
- LIBS += -lqpe
- }
- LIBS += -lopiecore2
+ #CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
+ #contains( CONFTEST, y ){
+ # LIBS += -lopiedb2 -lqpe
+ #} else {
+ # LIBS += -lqpe
+ #}
+ #LIBS += -lopiecore2
}
else {
QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib
# I am not sure whether it is a good idea to change the way plugins is build
# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X
CONFIG -= plugin
}
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
@@ -29,17 +29,18 @@ SOURCES = oapplication.cpp \
oprocctrl.cpp \
oresource.cpp \
osmartpointer.cpp \
ostorageinfo.cpp \
xmltree.cpp
# Disable Linux-only subsystems for MAC build
-!contains( CONFIG_TARGET_MACOSX, y ) {
+CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
+!contains( CONFTEST, y ) {
include ( linux/linux.pro )
} else {
message( "disabling linux-only subsystems for MAC build" )
}
include( device/device.pro )
INTERFACES =
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
@@ -148,17 +148,17 @@ bool QLibraryPrivate::freeLibrary()
//qDebug("QLibraryPrivate::freeLibrary\n");
//return FALSE;
if ( !pHnd )
return TRUE;
DyldLibDesc* desc = (DyldLibDesc*) pHnd;
NSModule mod = desc->mod;
NSObjectFileImage img = desc->img;
- DYLD_BOOL success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE);
+ bool success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE);
if ( success ) {
NSDestroyObjectFileImage(img);
delete desc;
pHnd = 0;
}
#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
else {
qWarning( "Error in NSUnLinkModule()" );
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 19e99f2..dcc1001 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -2202,17 +2202,17 @@ void QPEApplication::hideOrQuit()
e << d->appName;
d->qpe_main_widget->hide();
}
#endif
else
quit();
}
-#if (__GNUC__ > 2 )
+#if (__GNUC__ > 2 ) && !defined(_OS_MACX_)
extern "C" void __cxa_pure_virtual();
void __cxa_pure_virtual()
{
fprintf( stderr, "Pure virtual called\n");
abort();
}