From a3858e6354a6d40df8398f4eed7f55d3be9ae8f9 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Wed, 29 Jun 2011 13:28:28 +0200 Subject: [PATCH] Configure for mac. Don't use pkgconfig. Use the raster compositor. --- src/qt-compositor/hardware_integration/hardware_integration.pri | 2 +- src/qt-compositor/qt-compositor.pri | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) -- 2.7.4