Porting Opie to MacOS-X.

The base system and all platform independent applications and platforms
should work.
Please see $OPIEDIR/development/macosx for details

1 files changed, 4 insertions, 0 deletions

diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp
index c7a5211..2ad8e95 100644
--- a/library/fontdatabase.cpp
+++ b/library/fontdatabase.cpp
@@ -125,97 +125,101 @@ QStringList FontDatabase::families() const
 
 #ifdef QT_NO_FONTDATABASE
 /*!
   Returns a list of standard fontsizes.
 */
 QValueList<int> FontDatabase::standardSizes()
 {
     static int s[]={ 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28,
                      36, 48, 72, 0 };
     static bool first = TRUE;
     static QValueList<int> sList;
     if ( first ) {
         first = FALSE;
         int i = 0;
         while( s[i] )
             sList.append( s[i++] );
     }
     return sList;
 }
 
 #endif
 
 /*!
   Load any font renderer plugins that are available and make the fonts
   that the plugins can read available.
 */
 void FontDatabase::loadRenderers()
 {
 #ifndef QWS
     return;
 #else
 
 #ifndef QT_NO_COMPONENT
     if ( !factoryList )
         factoryList = new QValueList<FontFactory>;
 
     QValueList<FontFactory>::Iterator mit;
     for ( mit = factoryList->begin(); mit != factoryList->end(); ++mit ) {
         qt_fontmanager->factories.setAutoDelete( false );
         qt_fontmanager->factories.removeRef( (*mit).factory );
         qt_fontmanager->factories.setAutoDelete( true );
         (*mit).interface->release();
         (*mit).library->unload();
         delete (*mit).library;
     }
     factoryList->clear();
 
     QString path = QPEApplication::qpeDir() + "/plugins/fontfactories";
+#ifdef Q_OS_MACX
+    QDir dir( path, "lib*.dylib" );
+#else
     QDir dir( path, "lib*.so" );
+#endif
     
     if ( !dir.exists())
             return;
     
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         FontFactoryInterface *iface = 0;
         QLibrary *lib = new QLibrary( path + "/" + *it );
         if ( lib->queryInterface( IID_FontFactory, (QUnknownInterface**)&iface ) == QS_OK ) {
             FontFactory factory;
             factory.library = lib;
             factory.interface = iface;
             factory.factory = factory.interface->fontFactory();
             factoryList->append( factory );
             qt_fontmanager->factories.append( factory.factory );
             readFonts( factory.factory );
         } else {
             delete lib;
         }
     }
 #endif
 #endif
 }
 
 /*!
   \internal
 */
 void FontDatabase::readFonts( QFontFactory *factory )
 {
 #ifndef QWS
 return;
 #else
     // Load in font definition file
     QString fn = fontDir() + "fontdir";
     FILE* fontdef=fopen(fn.local8Bit(),"r");
     if(!fontdef) {
         QCString temp=fn.local8Bit();
         qWarning("Cannot find font definition file %s - is $QTDIR set correctly?",
                temp.data());
         return;
     }
     char buf[200]="";
     char name[200]="";
     char render[200]="";
     char file[200]="";
     char flags[200]="";
     char isitalic[10]="";