Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
glacier-home
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
glacier-home
Commits
d080d9d1
Commit
d080d9d1
authored
Sep 08, 2017
by
Aleksi Suomalainen
Committed by
eekkelund
Apr 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dual api tryout
parent
6cc54060
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
505 additions
and
3 deletions
+505
-3
main.cpp
src/main.cpp
+6
-1
compositor_new.qml
src/qml/compositor_new.qml
+489
-0
src.pro
src/src.pro
+10
-2
No files found.
src/main.cpp
View file @
d080d9d1
...
@@ -35,7 +35,12 @@ int main(int argc, char **argv)
...
@@ -35,7 +35,12 @@ int main(int argc, char **argv)
HomeApplication
app
(
argc
,
argv
,
QString
());
HomeApplication
app
(
argc
,
argv
,
QString
());
QmlPath
::
append
(
"/usr/share/lipstick-glacier-home-qt5/qml"
);
QmlPath
::
append
(
"/usr/share/lipstick-glacier-home-qt5/qml"
);
QGuiApplication
::
setFont
(
QFont
(
"Open Sans"
));
QGuiApplication
::
setFont
(
QFont
(
"Open Sans"
));
app
.
setCompositorPath
(
"/usr/share/lipstick-glacier-home-qt5/qml/compositor.qml"
);
if
(
QT_VERSION_MAJOR
==
5
&&
QT_VERSION_MINOR
<=
7
)
{
app
.
setCompositorPath
(
"/usr/share/lipstick-glacier-home-qt5/qml/compositor.qml"
);
}
if
(
QT_VERSION_MAJOR
==
5
&&
QT_VERSION_MINOR
>
7
)
{
app
.
setCompositorPath
(
"/usr/share/lipstick-glacier-home-qt5/qml/compositor_new.qml"
);
}
Qt
::
ScreenOrientation
nativeOrientation
=
app
.
primaryScreen
()
->
nativeOrientation
();
Qt
::
ScreenOrientation
nativeOrientation
=
app
.
primaryScreen
()
->
nativeOrientation
();
QByteArray
v
=
qgetenv
(
"GLACIER_NATIVEORIENTATION"
);
QByteArray
v
=
qgetenv
(
"GLACIER_NATIVEORIENTATION"
);
if
(
!
v
.
isEmpty
())
{
if
(
!
v
.
isEmpty
())
{
...
...
src/qml/compositor_new.qml
0 → 100644
View file @
d080d9d1
This diff is collapsed.
Click to expand it.
src/src.pro
View file @
d080d9d1
...
@@ -46,7 +46,9 @@ qml.files = qml/MainScreen.qml \
...
@@ -46,7 +46,9 @@ qml.files = qml/MainScreen.qml \
qml/GlacierRotation.qml \
qml/GlacierRotation.qml \
qml/DeviceLockUI.qml \
qml/DeviceLockUI.qml \
qml/LauncherItemWrapper.qml \
qml/LauncherItemWrapper.qml \
qml/LauncherItemFolder.qml
qml/LauncherItemFolder.qml \
qml/SearchListView.qml \
qml/compositor_new.qml
qmlcompositor.path = /usr/share/lipstick-glacier-home-qt5/qml/compositor
qmlcompositor.path = /usr/share/lipstick-glacier-home-qt5/qml/compositor
qmlcompositor.files = qml/compositor/WindowWrapperMystic.qml \
qmlcompositor.files = qml/compositor/WindowWrapperMystic.qml \
...
@@ -119,7 +121,13 @@ INSTALLS += styles \
...
@@ -119,7 +121,13 @@ INSTALLS += styles \
applauncher
applauncher
CONFIG += qt link_pkgconfig
CONFIG += qt link_pkgconfig
QT += quick compositor
QT += quick
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 7) {
QT += compositor
}
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION,7) {
QT += waylandcompositor
}
DEFINES += QT_COMPOSITOR_QUICK
DEFINES += QT_COMPOSITOR_QUICK
HEADERS += \
HEADERS += \
glacierwindowmodel.h
glacierwindowmodel.h
...
...
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