linux/mac compilation problem

preferencesAboutTextFull
Anatoly Mihalchenko 13 years ago
parent 25bf9810ee
commit e29d242a26
  1. 12
      src/domain/UBAbstractWidget.cpp
  2. 16
      src/domain/UBW3CWidget.cpp

@ -78,17 +78,17 @@ bool UBAbstractWidget::canBeContent()
{ {
// if we under MAC OS // if we under MAC OS
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
return mCanBeContent & OSType::type_MAC; return mCanBeContent & UBAbstractWidget::type_MAC;
#endif #endif
// if we under UNIX OS // if we under UNIX OS
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
return mCanBeContent & OSType::type_UNIX; return mCanBeContent & UBAbstractWidget::type_UNIX;
#endif #endif
// if we under WINDOWS OS // if we under WINDOWS OS
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
return mCanBeContent & OSType::type_WIN; return mCanBeContent & UBAbstractWidget::type_WIN;
#endif #endif
} }
@ -96,17 +96,17 @@ bool UBAbstractWidget::canBeTool()
{ {
// if we under MAC OS // if we under MAC OS
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
return mCanBeTool & OSType::type_MAC; return mCanBeTool & UBAbstractWidget::type_MAC;
#endif #endif
// if we under UNIX OS // if we under UNIX OS
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
return mCanBeTool & OSType::type_UNIX; return mCanBeTool & UBAbstractWidget::type_UNIX;
#endif #endif
// if we under WINDOWS OS // if we under WINDOWS OS
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
return mCanBeTool & OSType::type_WIN; return mCanBeTool & UBAbstractWidget::type_WIN;
#endif #endif
} }

@ -90,44 +90,44 @@ UBW3CWidget::UBW3CWidget(const QUrl& pWidgetUrl, QWidget *parent)
if( roles == "" || roles.contains("tool") ) if( roles == "" || roles.contains("tool") )
{ {
mCanBeTool = UBAbstractWidget::OSType::type_ALL; mCanBeTool = UBAbstractWidget::type_ALL;
} }
if( roles.contains("twin") ) if( roles.contains("twin") )
{ {
mCanBeTool |= UBAbstractWidget::OSType::type_WIN; mCanBeTool |= UBAbstractWidget::type_WIN;
} }
if( roles.contains("tmac") ) if( roles.contains("tmac") )
{ {
mCanBeTool |= UBAbstractWidget::OSType::type_MAC; mCanBeTool |= UBAbstractWidget::type_MAC;
} }
if( roles.contains("tunix") ) if( roles.contains("tunix") )
{ {
mCanBeTool |= UBAbstractWidget::OSType::type_UNIX; mCanBeTool |= UBAbstractWidget::type_UNIX;
} }
//---------// //---------//
if( roles == "" || roles.contains("content") ) if( roles == "" || roles.contains("content") )
{ {
mCanBeContent = UBAbstractWidget::OSType::type_ALL; mCanBeContent = UBAbstractWidget::type_ALL;
} }
if( roles.contains("cwin") ) if( roles.contains("cwin") )
{ {
mCanBeContent |= UBAbstractWidget::OSType::type_WIN; mCanBeContent |= UBAbstractWidget::type_WIN;
} }
if( roles.contains("cmac") ) if( roles.contains("cmac") )
{ {
mCanBeContent |= UBAbstractWidget::OSType::type_MAC; mCanBeContent |= UBAbstractWidget::type_MAC;
} }
if( roles.contains("cunix") ) if( roles.contains("cunix") )
{ {
mCanBeContent |= UBAbstractWidget::OSType::type_UNIX; mCanBeContent |= UBAbstractWidget::type_UNIX;
} }
//------------------------------// //------------------------------//

Loading…
Cancel
Save