Update SDK catch new modules

opengisch · Aug 19, 2020 · f739e28 · f739e28
1 parent 54a9efd
commit f739e28
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -112,7 +112,7 @@ IF (ANDROID)
   ADD_CUSTOM_TARGET(assets ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/android-build/assets/assets.zip")
 ENDIF (ANDROID)
 
-FIND_PACKAGE(Qt5 COMPONENTS Test Concurrent Core Qml Gui Xml Positioning Widgets PrintSupport Network Quick Svg OpenGL Sql PrintSupport Sensors REQUIRED)
+FIND_PACKAGE(Qt5 COMPONENTS Test Concurrent Core Qml Gui Xml Positioning Widgets PrintSupport Network Quick Svg OpenGL Sql PrintSupport Sensors WebView REQUIRED)
 
 ADD_SUBDIRECTORY(3rdparty/tessellate)
 ADD_SUBDIRECTORY(src/qgsquick)

diff --git a/sdk.conf b/sdk.conf
@@ -1 +1 @@
-osgeo4a_version=20200818
+osgeo4a_version=newmodules
diff --git a/src/app/app.pro b/src/app/app.pro
@@ -7,7 +7,7 @@ include( ../../qgis.pri )
 include( ../../version.pri )
 include( ../../assets.pri )
 
-QT += widgets concurrent xml positioning printsupport svg sql opengl sensors quick quickcontrols2 qml
+QT += widgets concurrent xml positioning printsupport svg sql opengl sensors quick quickcontrols2 qml webview
 
 android {
     QT += androidextras

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -26,6 +26,7 @@
 #include <QLabel>
 #include <QDialog>
 #include <QApplication>
+#include <QtWebView/QtWebView>
 
 #include "qgsapplication.h"
 #include "qgslogger.h"
@@ -101,9 +102,10 @@ int main( int argc, char **argv )
   app.setPluginPath( QApplication::applicationDirPath() );
   app.setPkgDataPath( AndroidPlatformUtilities().packagePath() );
 #else
+  QtWebView::initialize();
   QgsApplication app( argc, argv, true );
-  QSettings settings;
 
+  QSettings settings;
   app.setThemeName( settings.value( "/Themes", "default" ).toString() );
   app.setPrefixPath( CMAKE_INSTALL_PREFIX, true );
 #endif

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -167,6 +167,7 @@ TARGET_LINK_LIBRARIES(qfield_core
   Qt5::Positioning
   Qt5::Sql
   Qt5::Concurrent
+  Qt5::WebView
   ${QGIS_CORE_LIBRARY}
   ${QGIS_ANALYSIS_LIBRARY}
 )

diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
@@ -289,7 +289,7 @@ Page {
           }
           onLoadingChanged: {
             if ( !loading )
-              runJavaScript("document.body.offsetHeight", function(result) { htmlItem.height = ( result + 20 ) * screen.devicePixelRatio; } );
+              runJavaScript("document.body.offsetHeight", function(result) { htmlItem.height = ( result + 20 ) } );
           }
         }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		osgeo4a_version=20200818
		osgeo4a_version=newmodules