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
8a527053
Commit
8a527053
authored
Jul 26, 2018
by
Sergey Chupligin
Committed by
Sergey Chupligin
Jul 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[packaging] Fix warnings
parent
865503d5
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
3 deletions
+6
-3
touch.pro
examples/touch/touch.pro
+1
-0
editfilter.cpp
src/controls/editfilter.cpp
+1
-2
nemofocussingleton.h
src/controls/nemofocussingleton.h
+1
-1
qquickfilteringmousearea.cpp
src/controls/qquickfilteringmousearea.cpp
+2
-0
sizing.cpp
src/controls/sizing.cpp
+1
-0
No files found.
examples/touch/touch.pro
View file @
8a527053
...
@@ -13,6 +13,7 @@ mainqml.path = /usr/share/glacier-components/qml
...
@@ -13,6 +13,7 @@ mainqml.path = /usr/share/glacier-components/qml
qml
.
files
+=
\
qml
.
files
+=
\
content
/
AndroidDelegate
.
qml
\
content
/
AndroidDelegate
.
qml
\
content
/
ButtonPage
.
qml
\
content
/
ButtonPage
.
qml
\
content
/
BrokenPage
.
qml
\
content
/
ProgressBarPage
.
qml
\
content
/
ProgressBarPage
.
qml
\
content
/
SliderPage
.
qml
\
content
/
SliderPage
.
qml
\
content
/
TabBarPage
.
qml
\
content
/
TabBarPage
.
qml
\
...
...
src/controls/editfilter.cpp
View file @
8a527053
...
@@ -32,7 +32,6 @@ bool EditFilter::eventFilter(QObject *obj, QEvent *event)
...
@@ -32,7 +32,6 @@ bool EditFilter::eventFilter(QObject *obj, QEvent *event)
nemoFocus
->
edit
()
->
setProperty
(
"focus"
,
QVariant
(
false
));
nemoFocus
->
edit
()
->
setProperty
(
"focus"
,
QVariant
(
false
));
return
false
;
return
false
;
}
}
}
else
{
return
QObject
::
eventFilter
(
obj
,
event
);
}
}
return
QObject
::
eventFilter
(
obj
,
event
);
}
}
src/controls/nemofocussingleton.h
View file @
8a527053
...
@@ -35,7 +35,7 @@ public:
...
@@ -35,7 +35,7 @@ public:
private:
private:
QObject
*
m_edit
=
nullptr
;
QObject
*
m_edit
=
nullptr
;
NemoFocusSingleton
(
QObject
*
parent
=
nullptr
)
{}
NemoFocusSingleton
(
QObject
*
parent
=
nullptr
)
{
Q_UNUSED
(
parent
)
}
};
};
#endif // NEMOFOCUSSINGLETON_H
#endif // NEMOFOCUSSINGLETON_H
src/controls/qquickfilteringmousearea.cpp
View file @
8a527053
...
@@ -75,6 +75,8 @@ void QQuickFilteringMouseArea::mouseReleaseEvent(QMouseEvent *event) {
...
@@ -75,6 +75,8 @@ void QQuickFilteringMouseArea::mouseReleaseEvent(QMouseEvent *event) {
}
}
bool
QQuickFilteringMouseArea
::
sendMouseEvent
(
QQuickItem
*
item
,
QMouseEvent
*
event
)
{
bool
QQuickFilteringMouseArea
::
sendMouseEvent
(
QQuickItem
*
item
,
QMouseEvent
*
event
)
{
Q_UNUSED
(
item
);
QPointF
localPos
=
mapFromScene
(
event
->
windowPos
());
QPointF
localPos
=
mapFromScene
(
event
->
windowPos
());
QQuickWindow
*
c
=
window
();
QQuickWindow
*
c
=
window
();
QQuickItem
*
grabber
=
c
?
c
->
mouseGrabberItem
()
:
0
;
QQuickItem
*
grabber
=
c
?
c
->
mouseGrabberItem
()
:
0
;
...
...
src/controls/sizing.cpp
View file @
8a527053
...
@@ -15,6 +15,7 @@ Sizing::Sizing(QObject *parent) : QObject(parent)
...
@@ -15,6 +15,7 @@ Sizing::Sizing(QObject *parent) : QObject(parent)
qreal
refHeight
=
854.
;
//N9
qreal
refHeight
=
854.
;
//N9
qreal
refWidth
=
480.
;
//N9
qreal
refWidth
=
480.
;
//N9
qreal
refDpi
=
251
;
//N9
qreal
refDpi
=
251
;
//N9
Q_UNUSED
(
refDpi
);
m_p_height
=
qgetenv
(
"QT_QPA_EGLFS_PHYSICAL_HEIGHT"
).
toInt
();
m_p_height
=
qgetenv
(
"QT_QPA_EGLFS_PHYSICAL_HEIGHT"
).
toInt
();
m_p_width
=
qgetenv
(
"QT_QPA_EGLFS_PHYSICAL_WIDTH"
).
toInt
();
m_p_width
=
qgetenv
(
"QT_QPA_EGLFS_PHYSICAL_WIDTH"
).
toInt
();
...
...
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