| -rw-r--r-- | library/qpeapplication.cpp | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index d4734ae..a97efc0 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -21,5 +21,7 @@ #include <stdlib.h> #include <unistd.h> +#ifndef Q_OS_MACX #include <linux/limits.h> // needed for some toolchains (PATH_MAX) +#endif #include <qfile.h> #include <qqueue.h> @@ -90,6 +92,7 @@ #include <sys/file.h> #include <sys/ioctl.h> +#ifndef QT_NO_SOUND #include <sys/soundcard.h> - +#endif #include "qt_override_p.h" @@ -234,5 +237,9 @@ public: { QString path = QPEApplication::qpeDir() + "/plugins/textcodecs"; +#ifdef Q_OS_MACX + QDir dir( path, "lib*.dylib" ); +#else QDir dir( path, "lib*.so" ); +#endif QStringList list; if ( dir. exists ( )) @@ -259,5 +266,9 @@ public: { QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs"; +#ifdef Q_OS_MACX + QDir dir( path, "lib*.dylib" ); +#else QDir dir( path, "lib*.so" ); +#endif QStringList list; if ( dir. exists ( )) @@ -341,4 +352,5 @@ static void setVolume( int t = 0, int percent = -1 ) if ( percent < 0 ) percent = cfg.readNumEntry( "VolumePercent", 50 ); +#ifndef QT_NO_SOUND int fd = 0; if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { @@ -349,4 +361,5 @@ static void setVolume( int t = 0, int percent = -1 ) ::close( fd ); } +#endif } break; @@ -363,4 +376,5 @@ static void setMic( int t = 0, int percent = -1 ) percent = cfg.readNumEntry( "Mic", 50 ); +#ifndef QT_NO_SOUND int fd = 0; int mic = micMuted ? 0 : percent; @@ -369,4 +383,5 @@ static void setMic( int t = 0, int percent = -1 ) ::close( fd ); } +#endif } break; @@ -384,4 +399,5 @@ static void setBass( int t = 0, int percent = -1 ) percent = cfg.readNumEntry( "BassPercent", 50 ); +#ifndef QT_NO_SOUND int fd = 0; int bass = percent; @@ -390,4 +406,5 @@ static void setBass( int t = 0, int percent = -1 ) ::close( fd ); } +#endif } break; @@ -405,4 +422,5 @@ static void setTreble( int t = 0, int percent = -1 ) percent = cfg.readNumEntry( "TreblePercent", 50 ); +#ifndef QT_NO_SOUND int fd = 0; int treble = percent; @@ -411,4 +429,5 @@ static void setTreble( int t = 0, int percent = -1 ) ::close( fd ); } +#endif } break; @@ -1650,9 +1669,15 @@ void QPEApplication::internalSetStyle( const QString &style ) QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/"; +#ifdef Q_OS_MACX + if ( style. find ( ".dylib" ) > 0 ) + path += style; + else + path = path + "lib" + style. lower ( ) + ".dylib"; // compatibility +#else if ( style. find ( ".so" ) > 0 ) path += style; else path = path + "lib" + style. lower ( ) + ".so"; // compatibility - +#endif static QLibrary *lastlib = 0; static StyleInterface *lastiface = 0; |