sailfish: update with webengine
@@ -62,14 +62,14 @@ extern "C" {
const char* rho_sys_qt_getWebviewFramework()
{
-//#ifndef OS_SAILFISH
+#ifndef OS_SAILFISH
if (qt_webview_framework[0] == '\0') {
- #if defined(RHODES_VERSION_1) || (defined(OS_SAILFISH) && !defined(ENABLE_Q_WEB_ENGINE))
- const QByteArray ver = QString("WEBKIT").toLatin1();
+ #if defined(RHODES_VERSION_1))
+ const QByteArray ver = QString("WEBKIT/").append(qWebKitVersion()).toLatin1();
#endif
- #if defined(RHODES_VERSION_2) || (defined(OS_SAILFISH) && defined(ENABLE_Q_WEB_ENGINE))
+ #if defined(RHODES_VERSION_2))
const QByteArray ver = QString("WEBENGINE/").append(QTWEBENGINE_VERSION_STR).toLatin1();
#endif
if (ver.length() < 32) {
@@ -77,7 +77,7 @@ const char* rho_sys_qt_getWebviewFramework()
qt_webview_framework[ver.length()] = '\0';
}
}
-//#endif
+#endif
return qt_webview_framework;
}
