--- qtbase/mkspecs/common/orig.macx.conf	2014-12-05 17:24:38.000000000 +0100
+++ qtbase/mkspecs/common/macx.conf	2015-01-25 22:06:47.000000000 +0100
@@ -5,4 +5,9 @@
 QMAKE_PLATFORM         += osx macx
 QMAKE_MAC_SDK           = macosx
 
+# X11 is not inexistant on OS X; provide the library requirements but leave it to the
+# user to make them accessible during the Qt build.
+QMAKE_LIBS_X11          = -lXext -lX11
+QMAKE_LIBS_OPENVG       = -lOpenVG
+
 include(mac.conf)
--- qtbase/src/plugins/platforms/xcb/orig.xcb-plugin.pro	2014-12-05 17:24:37.000000000 +0100
+++ qtbase/src/plugins/platforms/xcb/xcb-plugin.pro	2015-01-25 22:32:33.000000000 +0100
@@ -55,6 +55,9 @@
         SOURCES += qxcbconnection_xi2.cpp
         LIBS += -lXi
     }
+    mac {
+        LIBS += -lGL
+    }
 }
 
 # to support custom cursors with depth > 1
--- qtbase/src/platformsupport/fontdatabases/orig.fontdatabases.pri	2014-12-05 17:24:31.000000000 +0100
+++ qtbase/src/platformsupport/fontdatabases/fontdatabases.pri	2015-01-25 19:25:20.000000000 +0100
@@ -1,8 +1,8 @@
-!win32|contains(QT_CONFIG, freetype):!mac {
+!win32|contains(QT_CONFIG, freetype) {
     include($$PWD/basic/basic.pri)
 }
 
-unix:!mac {
+unix {
     CONFIG += qpa/genericunixfontdatabase
     include($$PWD/genericunix/genericunix.pri)
     contains(QT_CONFIG,fontconfig) {
--- qtbase/src/platformsupport/services/orig.services.pri	2014-12-05 17:24:31.000000000 +0100
+++ qtbase/src/platformsupport/services/services.pri	2015-01-25 22:35:28.000000000 +0100
@@ -1,3 +1,3 @@
-unix:!mac {
+unix {
     include($$PWD/genericunix/genericunix.pri)
 }
--- qtbase/src/platformsupport/themes/orig.themes.pri	2014-12-05 17:24:31.000000000 +0100
+++ qtbase/src/platformsupport/themes/themes.pri	2015-01-25 22:30:37.000000000 +0100
@@ -1,3 +1,3 @@
-unix:!mac {
+unix {
     include($$PWD/genericunix/genericunix.pri)
 }
--- qtbase/src/plugins/platforms/offscreen/orig.offscreen.pro	2014-12-05 17:24:37.000000000 +0100
+++ qtbase/src/plugins/platforms/offscreen/offscreen.pro	2015-01-25 22:06:21.000000000 +0100
@@ -18,7 +18,7 @@
 
 OTHER_FILES += offscreen.json
 
-contains(QT_CONFIG, xlib):contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2) {
+contains(QT_CONFIG, xlib):contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!mac {
     SOURCES += qoffscreenintegration_x11.cpp
     HEADERS += qoffscreenintegration_x11.h
     system(echo "Using X11 offscreen integration with GLX")