Merge branch 'jb36017-load-html' into 'master'

Implement the QuickMozView::loadHtml() stub See merge request mer-core/qtmozembed!53
sailfishos · Mar 19, 2020 · 9a1cc94 · 9a1cc94
2 parents 6e13457 + 5d8a41d
commit 9a1cc94
Show file tree

Hide file tree

Showing 17 changed files with 814 additions and 404 deletions.
diff --git a/rpm/qtmozembed-qt5.spec b/rpm/qtmozembed-qt5.spec
@@ -1,4 +1,4 @@
-%global min_xulrunner_version 45.9.1
+%global min_xulrunner_version 45.9.1+git17
 
 %define system_nspr       1
 %define system_pixman     1

diff --git a/src/qmozembed.pri b/src/qmozembed.pri
@@ -16,6 +16,9 @@ isEmpty(OBJ_PATH) {
   message($$BIN_DIR - binary dir)
 }
 
+CONFIG += \
+    egl
+
 QMAKE_CXXFLAGS += -I $$GECKO_INCLUDE_DIR -include mozilla-config.h
 unix:QMAKE_CXXFLAGS += -fno-short-wchar -std=c++0x -fPIC
 DEFINES += XPCOM_GLUE=1 XPCOM_GLUE_USE_NSPR=1 MOZ_GLUE_IN_PROGRAM=1