Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
e29d242a
Commit
e29d242a
authored
Aug 16, 2011
by
Anatoly Mihalchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linux/mac compilation problem
parent
25bf9810
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
UBAbstractWidget.cpp
src/domain/UBAbstractWidget.cpp
+6
-6
UBW3CWidget.cpp
src/domain/UBW3CWidget.cpp
+8
-8
No files found.
src/domain/UBAbstractWidget.cpp
View file @
e29d242a
...
@@ -78,17 +78,17 @@ bool UBAbstractWidget::canBeContent()
...
@@ -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()
...
@@ -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
}
}
...
...
src/domain/UBW3CWidget.cpp
View file @
e29d242a
...
@@ -90,44 +90,44 @@ UBW3CWidget::UBW3CWidget(const QUrl& pWidgetUrl, QWidget *parent)
...
@@ -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
;
}
}
//------------------------------//
//------------------------------//
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment