Force disable the hardware compositor.

sailfishos · Jul 25, 2018 · 41688d3 · 41688d3
1 parent 89f267b
commit 41688d3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/doc/doc.pro b/doc/doc.pro
@@ -1,33 +1,31 @@
-# Stupid qmake wants to link everything.
-QMAKE_LINK = @: IGNORE THIS LINE
+TEMPLATE = aux
 
-QMAKE_EXTRA_TARGETS += doc notification_doc
-QMAKE_EXTRA_COMPILER += doc notification_doc
+lipstick_doc.config       += no_check_exist no_link explicit_dependencies
+lipstick_doc.commands      = doxygen $$PWD/doxygen.cfg
+lipstick_doc.input         = $$PWD/doxygen.cfg
+lipstick_doc.output        = $$OUT_PWD/html/index.html
 
-doc.target        = html/index.html
-doc.config       += no_check_exist no_link explicit_dependencies
-doc.commands      = doxygen doxygen.cfg
-doc.input         = $${doc.depends}
-doc.output        = $${doc.target}
-
-notification_doc.target        = notifications/html/index.html
 notification_doc.config       += no_check_exist no_link explicit_dependencies
-notification_doc.commands      = doxygen notifications/doxygen.cfg
-notification_doc.input         = $${notification_doc.depends}
-notification_doc.output        = $${notification_doc.target}
-
-## Make are doc target build by default If 'make' is executed in doc folder
-PRE_TARGETDEPS += $${doc.output} $${notification_doc.output}
+notification_doc.commands      = doxygen $$PWD/notifications/doxygen.cfg
+notification_doc.input         = $$PWD/notifications/doxygen.cfg
+notification_doc.output        = $$OUT_PWD/notifications/html/index.html
 
 # Install rules
-htmldocs.files = html/*
-htmldocs.path = /usr/share/doc/lipstick
+htmldocs.files = \
+    lipstick \
+    lipstick-notification
+htmldocs.path = /usr/share/doc
 htmldocs.CONFIG += no_check_exist
 
-notification_htmldocs.files = notifications/html/*
-notification_htmldocs.path = /usr/share/doc/lipstick-notification
-notification_htmldocs.CONFIG += no_check_exist
+QMAKE_EXTRA_COMPILERS += \
+    lipstick_doc \
+    notification_doc
+
+QMAKE_EXTRA_TARGETS += \
+    lipstick_doc \
+    notification_doc
 
-INSTALLS += htmldocs notification_htmldocs
+INSTALLS += \
+    htmldocs \
 
 OTHER_FILES = src/*.dox
diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg
@@ -872,7 +872,7 @@ GENERATE_HTML          = YES
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT            = lipstick
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank

diff --git a/doc/notifications/doxygen.cfg b/doc/notifications/doxygen.cfg
@@ -872,7 +872,7 @@ GENERATE_HTML          = YES
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = notifications/html
+HTML_OUTPUT            = lipstick-notification
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank

diff --git a/rpm/lipstick-qt5.spec b/rpm/lipstick-qt5.spec
@@ -113,6 +113,7 @@ Translation files for the lipstick package.
 %qmake5 VERSION=%{version}
 
 make %{?_smp_mflags}
+make -C doc lipstick_doc notification_doc
 
 %install
 rm -rf %{buildroot}
@@ -154,11 +155,11 @@ mkdir -p %{buildroot}/%{icondirectory}
 
 %files doc
 %defattr(-,root,root,-)
-#%{_datadir}/doc/lipstick/*
+%{_datadir}/doc/lipstick/*
 
 %files notification-doc
 %defattr(-,root,root,-)
-#%{_datadir}/doc/lipstick-notification/*
+%{_datadir}/doc/lipstick-notification/*
 
 %files ts-devel
 %defattr(-,root,root,-)

diff --git a/src/compositor/hwcrenderstage.cpp b/src/compositor/hwcrenderstage.cpp
@@ -118,7 +118,8 @@ bool HwcRenderStage::m_hwcEnabled = false;
 
 void HwcRenderStage::initialize(LipstickCompositor *lipstick)
 {
-    static bool enabled = qgetenv("LIPSTICK_HARDWARE_COMPOSITOR").toInt() != 0;
+    // JB#42170 Force off for now.
+    static bool enabled = false && qgetenv("LIPSTICK_HARDWARE_COMPOSITOR").toInt() != 0;
     QPlatformNativeInterface *iface = QGuiApplicationPrivate::platform_integration->nativeInterface();
     if (!enabled) {
         qDebug() << "Hardware Compositor support is disabled";