From: Alberto Villa <avilla@FreeBSD.org>
Date: Thu, 10 Nov 2011 15:04:37 +0000 (+0100)
Subject: Merge branch 'buildsystem'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=246189a7745fd630a02ee7ae41d8f2571b03f56f;hp=d42c81ffc8e1a437fd68890795d2331395dd7bce;p=kdenlive

Merge branch 'buildsystem'
---

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 34297068..ff953b5b 100644
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -120,10 +120,10 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
 
     m_page4 = addPage(p4, i18n("Capture"), "media-record");
     m_configCapture.tabWidget->setCurrentIndex(KdenliveSettings::defaultcapture());
-#ifndef USE_V4L
+#ifdef Q_WS_MAC
     m_configCapture.tabWidget->setEnabled(false);
     m_configCapture.kcfg_defaultcapture->setEnabled(false);
-    m_configCapture.label->setText(i18n("Capture is not yet available on this platform."));
+    m_configCapture.label->setText(i18n("Capture is not yet available on Mac OS X."));
 #endif
 
     QWidget *p5 = new QWidget;
diff --git a/src/videoglwidget.cpp b/src/videoglwidget.cpp
index c6f04bae..9595ef25 100644
--- a/src/videoglwidget.cpp
+++ b/src/videoglwidget.cpp
@@ -1,7 +1,7 @@
 
 #include <QtGui>
 #include <QtOpenGL>
-#ifdef __APPLE__
+#ifdef Q_WS_MAC
 #include <OpenGL/glu.h>
 #else
 #include <GL/glu.h>