diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-14 13:29:13 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-06-14 13:29:13 -0700 |
| commit | 5e345fba0a3cc8dd7e2316ad5a8c2d2b54cea37d (patch) | |
| tree | 51264876dc27ab3e30ee880a998346440f7dd23b | |
| parent | 1ec5e6ffc4f9f32a6d7149e52b161aeaba6adfa4 (diff) | |
| download | subsurface-5e345fba0a3cc8dd7e2316ad5a8c2d2b54cea37d.tar.gz | |
Make system detection compile on Mac
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | subsurface-configure.pri | 3 | ||||
| -rw-r--r-- | subsurfacesysinfo.cpp | 21 |
2 files changed, 8 insertions, 16 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri index b87e5b241..b147eba21 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -168,6 +168,9 @@ win32 { LIBS += -lwsock32 DEFINES -= UNICODE } +mac { + LIBS += -framework CoreServices +} # # misc diff --git a/subsurfacesysinfo.cpp b/subsurfacesysinfo.cpp index 5d556c6fc..9855af819 100644 --- a/subsurfacesysinfo.cpp +++ b/subsurfacesysinfo.cpp @@ -6,6 +6,11 @@ #include <sys/utsname.h> #endif +#ifdef __APPLE__ +#include <MacTypes.h> +#include <CoreServices/CoreServices.h> +#endif + // main part: processor type #if defined(Q_PROCESSOR_ALPHA) # define ARCH_PROCESSOR "alpha" @@ -80,22 +85,6 @@ #if defined(Q_OS_OSX) -Q_CORE_EXPORT OSErr qt_mac_create_fsref(const QString &file, FSRef *fsref) -{ - return FSPathMakeRef(reinterpret_cast<const UInt8 *>(file.toUtf8().constData()), fsref, 0); -} - -Q_CORE_EXPORT void qt_mac_to_pascal_string(QString s, Str255 str, TextEncoding encoding=0, int len=-1) -{ - Q_UNUSED(encoding); - Q_UNUSED(len); - CFStringGetPascalString(QCFString(s), str, 256, CFStringGetSystemEncoding()); -} - -Q_CORE_EXPORT QString qt_mac_from_pascal_string(const Str255 pstr) { - return QCFString(CFStringCreateWithPascalString(0, pstr, CFStringGetSystemEncoding())); -} - SubsurfaceSysInfo::MacVersion SubsurfaceSysInfo::macVersion() { #if defined(Q_OS_OSX) |