Commit d080d9d1 authored by Aleksi Suomalainen's avatar Aleksi Suomalainen Committed by eekkelund

Dual api tryout

parent 6cc54060
......@@ -35,7 +35,12 @@ int main(int argc, char **argv)
HomeApplication app(argc, argv, QString());
QmlPath::append("/usr/share/lipstick-glacier-home-qt5/qml");
QGuiApplication::setFont(QFont("Open Sans"));
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();
QByteArray v = qgetenv("GLACIER_NATIVEORIENTATION");
if (!v.isEmpty()) {
......
This diff is collapsed.
......@@ -46,7 +46,9 @@ qml.files = qml/MainScreen.qml \
qml/GlacierRotation.qml \
qml/DeviceLockUI.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.files = qml/compositor/WindowWrapperMystic.qml \
......@@ -119,7 +121,13 @@ INSTALLS += styles \
applauncher
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
HEADERS += \
glacierwindowmodel.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment