Merge branch 'buildsystem'

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 34297068c8e61ff847ac971ade8d10fabbb2b8fe..ff953b5bd3748feeb2fe5a93f6278f9239ad412e 100644 (file)
--- 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 c6f04baeafb90eacc079069504c31aec159588b5..9595ef254da658d7c1ab6126f071619fd915f230 100644 (file)
--- 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>