port to Qt 5.4

shared.pri

@@ -56,20 +56,28 @@ win32-msvc2010 {
     CONFIG+=win32-msvc
 }
 
+# building for Mac OS X on the PowerPC platform:
 macx {
     rppc {
-        # building for Mac OS X on the PowerPC platform:
         CONFIG += ppc
         CONFIG -= x86
         QMAKE_CFLAGS_X86 =
         QMAKE_CXXFLAGS_X86 =
         QMAKE_OBJECTIVE_CFLAGS_X86 =
         QMAKE_LFLAGS_X86 =
     }
+}
+
+# settings for all Mac OS X builds:
+macx {
     QMAKE_CXXFLAGS_X86 += -Werror=return-type
-    !macx-clang-libc++ {
+    macx-clang* {
         QMAKE_CXXFLAGS += -mmacosx-version-min=10.6
     }
+
+    contains(QT_VERSION, ^5\\..*\\..*) {
+        QMAKE_LFLAGS += -F/System/Library/Frameworks
+    }
 }
 
 win32 {
@@ -112,12 +120,6 @@ else {
         uitools
 }
 
-# required for the navel spatial index lib:
-!win32 {
-    DEFINES += PTHREADS
-    DEFINES += HAVE_PTHREAD_H
-}
-
 CONFIG -= warn_off
 CONFIG += warn_on
 CONFIG += debug_and_release ordered embed_manifest_dll embed_manifest_exe