1 files changed, 39 insertions, 6 deletions

diff --git a/qmake/tools/qglobal.cpp b/qmake/tools/qglobal.cpp
index 47cd6bd..342005d 100644
--- a/qmake/tools/qglobal.cpp
+++ b/qmake/tools/qglobal.cpp
@@ -151,3 +151,24 @@ bool qSysInfo( int *wordSize, bool *bigEndian )
 
-#if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
+#if !defined(QWS) && defined(Q_OS_MAC)
+
+#include "qt_mac.h"
+
+int qMacVersion()
+{
+    static int macver = Qt::MV_Unknown;
+    static bool first = TRUE;
+    if(first) {
+        first = FALSE;
+        long gestalt_version;
+        if(Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) {
+            if(gestalt_version >= 0x1020 && gestalt_version < 0x1030)
+                macver = Qt::MV_10_DOT_2;
+            else if(gestalt_version >= 0x1010 && gestalt_version < 0x1020)
+                macver = Qt::MV_10_DOT_1;
+        }
+    }
+    return macver;
+}
+Qt::MacintoshVersion qt_macver = (Qt::MacintoshVersion)qMacVersion();
+#elif defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
 bool qt_winunicode;
@@ -323,3 +344,15 @@ static const int QT_BUFFER_LENGTH = 8196;	// internal buffer length
 #ifdef Q_OS_MAC
-const unsigned char * p_str(const char * c, int len=-1)
+QString cfstring2qstring(CFStringRef str)
+{
+    CFIndex length = CFStringGetLength(str); 
+    if(const UniChar *chars = CFStringGetCharactersPtr(str)) 
+        return QString((QChar *)chars, length);
+    UniChar *buffer = (UniChar*)malloc(length * sizeof(UniChar)); 
+    CFStringGetCharacters(str, CFRangeMake(0, length), buffer); 
+    QString ret((QChar *)buffer, length);
+    free(buffer); 
+    return ret;
+}
+
+unsigned char * p_str(const char * c, int len=-1)
 {
@@ -339,3 +372,3 @@ const unsigned char * p_str(const char * c, int len=-1)
 
-const unsigned char * p_str(const QString &s)
+unsigned char * p_str(const QString &s)
 {
@@ -643,4 +676,4 @@ void qSystemWarning( const char* msg, int code )
 
-    If \a p is null, a fatal messages says that the program ran out of
-    memory and exits. If \e p is not null, nothing happens.
+    If \a p is 0, a fatal messages says that the program ran out of
+    memory and exits. If \e p is not 0, nothing happens.
 
@@ -654,3 +687,3 @@ void qSystemWarning( const char* msg, int code )
 
-        a = new int[80];                 // Right
+        a = new (nothrow) int[80];       // Right
         Q_CHECK_PTR( a );