From: Morten Sorvig <morten.sorvig@nokia.com>
Date: Wed, 29 Jun 2011 11:28:28 +0000 (+0200)
Subject: Configure for mac.
X-Git-Tag: qt-v5.0.0-alpha1~223^2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3858e6354a6d40df8398f4eed7f55d3be9ae8f9;p=profile%2Fivi%2Fqtwayland.git

Configure for mac.

Don't use pkgconfig. Use the raster compositor.
---

diff --git a/src/qt-compositor/hardware_integration/hardware_integration.pri b/src/qt-compositor/hardware_integration/hardware_integration.pri
index 004c05f..803a4cb 100644
--- a/src/qt-compositor/hardware_integration/hardware_integration.pri
+++ b/src/qt-compositor/hardware_integration/hardware_integration.pri
@@ -1,6 +1,6 @@
 QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
 
-contains(QT_CONFIG, opengl):!isEqual(QT_WAYLAND_GL_CONFIG,nogl) {
+!mac:contains(QT_CONFIG, opengl):!isEqual(QT_WAYLAND_GL_CONFIG,nogl) {
     HEADERS += \
         $$PWD/graphicshardwareintegration.h
 
diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri
index 7f5f5d4..62206d0 100644
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/qt-compositor/qt-compositor.pri
@@ -1,5 +1,5 @@
 INCLUDEPATH += $$PWD
-use_pkgconfig {
+!mac:use_pkgconfig {
     QMAKE_CXXFLAGS += $$system(pkg-config --cflags wayland-server)
     #for some reason this is not included in the cflags line
     INCLUDEPATH += $$system(pkg-config --variable=includedir wayland-server)