Commit a0447395 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

mac: Q_WS_MAC and QT_MAC_USE_COCOA are deprecated

parent 51c74204
......@@ -69,7 +69,7 @@ LanguageHelper::languageChanged( const QString &lang )
{
m_translator->load( TS_PREFIX + QLocale::system().name(), ":/ts/" );
m_qtTranslator->load( "qt_" + QLocale::system().name(),
#if defined( Q_OS_WIN32 ) || defined( Q_WS_MAC )
#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
qApp->applicationDirPath() + "/ts/" );
#else
QLibraryInfo::location( QLibraryInfo::TranslationsPath ) );
......@@ -79,7 +79,7 @@ LanguageHelper::languageChanged( const QString &lang )
{
m_translator->load( TS_PREFIX + lang, ":/ts/" );
m_qtTranslator->load( "qt_" + lang,
#if defined( Q_OS_WIN32 ) || defined( Q_WS_MAC )
#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
qApp->applicationDirPath() + "/ts/" );
#else
QLibraryInfo::location( QLibraryInfo::TranslationsPath ) );
......
......@@ -78,7 +78,7 @@ PreviewWidget::setRenderer( GenericRenderer *renderer )
m_renderer->setRenderWidget( m_ui->renderWidget );
#if defined ( Q_WS_MAC )
#if defined ( Q_OS_MAC )
/* Releases the NSView in the RenderWidget*/
m_ui->renderWidget->release();
#endif
......
......@@ -26,7 +26,7 @@
#include <QtGlobal>
#include <QWidget>
#if defined( Q_WS_MAC ) && defined( QT_MAC_USE_COCOA )
#if defined( Q_OS_MAC )
#include <QMacCocoaViewContainer>
#ifdef __OBJC__
......@@ -45,7 +45,7 @@ class RenderWidget : public QWidget
Q_OBJECT
public:
#if defined( Q_WS_MAC ) && defined( QT_MAC_USE_COCOA )
#if defined( Q_OS_MAC )
RenderWidget( QWidget* parent = NULL );
NativeNSViewRef id() const;
void release();
......
......@@ -21,7 +21,7 @@
*****************************************************************************/
#include <QtGlobal>
#if defined( Q_WS_MAC ) && defined( QT_MAC_USE_COCOA )
#if defined( Q_OS_MAC )
#include "RenderWidget.h"
#include <QPalette>
......
......@@ -37,7 +37,7 @@ ProjectWizard::ProjectWizard( QWidget* parent )
{
// Create Wizard
#ifndef Q_WS_MAC
#ifndef Q_OS_MAC
setWizardStyle( QWizard::ModernStyle );
#endif
......
......@@ -277,7 +277,7 @@ MediaPlayer::isSeekable()
void
MediaPlayer::setDrawable( void* drawable )
{
#if defined ( Q_WS_MAC )
#if defined ( Q_OS_MAC )
libvlc_media_player_set_nsobject( m_internalPtr, drawable );
#elif defined ( Q_OS_UNIX )
libvlc_media_player_set_xwindow( m_internalPtr, reinterpret_cast<intptr_t>( drawable ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment