Configure for mac.
authorMorten Sorvig <morten.sorvig@nokia.com>
Wed, 29 Jun 2011 11:28:28 +0000 (13:28 +0200)
committerMorten Sorvig <morten.sorvig@nokia.com>
Wed, 29 Jun 2011 11:28:28 +0000 (13:28 +0200)
Don't use pkgconfig. Use the raster compositor.

src/qt-compositor/hardware_integration/hardware_integration.pri
src/qt-compositor/qt-compositor.pri

index 004c05f..803a4cb 100644 (file)
@@ -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
 
index 7f5f5d4..62206d0 100644 (file)
@@ -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)