Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qtquickcontrols-nemo
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
NemoMobile
qtquickcontrols-nemo
Commits
e96571cf
Commit
e96571cf
authored
Apr 10, 2017
by
Chupligin Sergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Packaking] fix qt 5.6 build
parent
1971d150
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
sizing.h
src/controls/sizing.h
+6
-2
No files found.
src/controls/sizing.h
View file @
e96571cf
...
@@ -3,10 +3,11 @@
...
@@ -3,10 +3,11 @@
#include <QObject>
#include <QObject>
#if QT_VERSION < QT_VERSION_CHECK(5,6,0)
#ifndef Q_ENUM
#ifndef Q_ENUM
#define Q_ENUM(x) Q_ENUMS(x)
#define Q_ENUM(x) Q_ENUMS(x)
#endif
#endif
#endif
class
Sizing
:
public
QObject
class
Sizing
:
public
QObject
{
{
Q_OBJECT
Q_OBJECT
...
@@ -21,8 +22,11 @@ public:
...
@@ -21,8 +22,11 @@ public:
xxhdpi
,
xxhdpi
,
xxxhdpi
xxxhdpi
};
};
#if QT_VERSION < QT_VERSION_CHECK(5,6,0)
Q_ENUM
(
Densities
)
Q_ENUM
(
Densities
)
#else
Q_ENUMS
(
Densities
)
#endif
bool
isValid
(){
return
m_valid
;}
bool
isValid
(){
return
m_valid
;}
float
getMmScaleFactor
(){
return
m_mm_factor
;}
float
getMmScaleFactor
(){
return
m_mm_factor
;}
...
...
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