Changes for compiling on desktop

1 files changed, 9 insertions, 8 deletions

diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index c07d50f..c091e05 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -41,12 +41,9 @@
 #include <qpe/qpeapplication.h>
 #include <qtopia/qlibrary.h>
+#else
+#include <qlibrary.h> 
 #endif
 
-/*US
-#ifdef Q_WS_X11
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#endif
-*/
+
 template class QAsciiDict<KLibrary>;
 
@@ -193,5 +190,4 @@ void* KLibrary::symbol( const char* symname ) const
     {
 //US        kdWarning(150) << "KLibrary: " << lt_dlerror() << endl;
-        kdWarning(150) << "KLibrary: " << m_libname << ", symbol:" << symname << " not found " << endl;
         return 0;
     }
@@ -478,6 +474,9 @@ KLibrary* KLibLoader::library( const char *name )
       if ( libfile.isEmpty() )
         return 0;
-
+#ifdef DESKTOP_VERSION
+      QLibrary *qlib = new QLibrary( libfile.latin1() );
+#else
       QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately );
+#endif
         
 //US      lt_dlhandle handle = lt_dlopen( libfile.latin1() );
@@ -600,4 +599,5 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 //    kdDebug(150) << "try to dlclose " << wrap->name << ": yes, done." << endl;
 
+#if 0
 #ifndef Q_WS_QWS
     if ( !deleted_one ) {
@@ -629,4 +629,5 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 #endif
 
+#endif // 0
     deleted_one = true;
 //US    lt_dlclose(wrap->handle);