rhodes 7.5.1 → 7.6.0

data/platform/shared/common/iphone/RhoCryptImpl.mm

@@ -32,6 +32,14 @@
 #import <CommonCrypto/CommonDigest.h>
 #import <CommonCrypto/CommonCryptor.h>
 
+#include "common/app_build_capabilities.h"
+
+
+#ifdef APP_BUILD_CAPABILITY_IOS_CRYPTO_FORCE_AES_GCM
+#import <rhoappbaselib-Swift.h>
+RhoCryptAESGCM* swift_aes_gcm = nil;
+#endif
+
 #define kChosenCipherBlockSize	kCCBlockSizeAES128
 #define kChosenCipherKeySize	kCCKeySizeAES256
 #define kChosenDigestLength		CC_SHA1_DIGEST_LENGTH
@@ -59,6 +67,18 @@ CRhoCryptImpl::CRhoCryptImpl(void) : m_dbKeyData(NULL)
 {
 	m_dwLastError = 0;
 	currentKeySize = kCCKeySizeAES256;
+    
+    
+    
+#ifdef APP_BUILD_CAPABILITY_IOS_CRYPTO_FORCE_AES_GCM
+    swift_aes_gcm = [[RhoCryptAESGCM alloc] init];
+#endif
+    
+    //[swift_aes_gcm run_crypto_test];
+    //NSData* key_data = [swift_aes_gcm generate_new_key];
+    //NSString* str = [key_data base64EncodedStringWithOptions:0];;
+    //RAWLOG_INFO1("CALL SWIFT Object RESULT = [%s]", [str UTF8String]);
+    //int o = 9;
 }
 
 CRhoCryptImpl::~CRhoCryptImpl(void)
@@ -586,23 +606,41 @@ void CRhoCryptImpl::readKeyFromStorage() {
     
 void CRhoCryptImpl::generateNewKey()
 {
-    RAWLOG_INFO1("CRhoCryptImpl::generateNewKey() currentKeySize = %d", (int)currentKeySize);
     
-	OSStatus sanityCheck = noErr;
-	uint8_t * symmetricKey = NULL;
-	
-	// Allocate some buffer space. I don't trust calloc.
-	symmetricKey = (uint8_t *)malloc( currentKeySize * sizeof(uint8_t) );
-	memset((void *)symmetricKey, 0x0, currentKeySize);
-	
-	sanityCheck = SecRandomCopyBytes(kSecRandomDefault, currentKeySize, symmetricKey);
-	if ( sanityCheck != noErr )
-	{
-		free(symmetricKey);
-		LOG(ERROR) + "Problem generating the key, OSStatus: " + sanityCheck + "; errno: " + errno;
-	}
-	else	
-		m_dbKeyData = symmetricKey;
+#ifdef APP_BUILD_CAPABILITY_IOS_CRYPTO_FORCE_AES_GCM
+    
+    if ([swift_aes_gcm is_aes_gcm_available]) {
+        
+        
+        NSData* key_data = [swift_aes_gcm generate_new_key];
+        uint8_t * symmetricKey = NULL;
+        symmetricKey = (uint8_t *)malloc( currentKeySize * sizeof(uint8_t) );
+        
+        memcpy(symmetricKey, [key_data bytes], currentKeySize);
+        
+        m_dbKeyData = symmetricKey;
+    }
+    else
+#endif
+    {
+        RAWLOG_INFO1("CRhoCryptImpl::generateNewKey() currentKeySize = %d", (int)currentKeySize);
+        
+        OSStatus sanityCheck = noErr;
+        uint8_t * symmetricKey = NULL;
+        
+        // Allocate some buffer space. I don't trust calloc.
+        symmetricKey = (uint8_t *)malloc( currentKeySize * sizeof(uint8_t) );
+        memset((void *)symmetricKey, 0x0, currentKeySize);
+        
+        sanityCheck = SecRandomCopyBytes(kSecRandomDefault, currentKeySize, symmetricKey);
+        if ( sanityCheck != noErr )
+        {
+            free(symmetricKey);
+            LOG(ERROR) + "Problem generating the key, OSStatus: " + sanityCheck + "; errno: " + errno;
+        }
+        else
+            m_dbKeyData = symmetricKey;
+    }
 }
 	
 void CRhoCryptImpl::initContext(const char* szPartition)
@@ -661,50 +699,88 @@ int CRhoCryptImpl::db_encrypt( const char* szPartition, int size, unsigned char*
 {
     initContext(szPartition);
 
-    // Initialization vector; dummy in this case 0's.
-    uint8_t iv[kChosenCipherBlockSize];
-    memset((void *) iv, 0x0, (size_t) sizeof(iv));
-	
-	size_t movedBytes = 0;
-	
-	checkError( CCCrypt(  kCCEncrypt, kCCAlgorithmAES,
-					   0, //kCCOptionPKCS7Padding
-					   (const void *)m_dbKeyData,
-					   currentKeySize,
-					   iv,
-					   (const void *) data,
-					   size,
-					   (void *)dataOut,
-					   size,
-					   &movedBytes
-					   ) );
-	
-    return getErrorCode() == 0 ? 1 : 0;
+#ifdef APP_BUILD_CAPABILITY_IOS_CRYPTO_FORCE_AES_GCM
+    if ([swift_aes_gcm is_aes_gcm_available]) {
+        NSData* page = [NSData dataWithBytes:(const void *)data length:sizeof(unsigned char)*size];
+        NSData* key = [NSData dataWithBytes:(const void *)m_dbKeyData length:sizeof(unsigned char)*currentKeySize];
+        
+        NSData* encrypted = [swift_aes_gcm encrypt_page:page :key];
+        if (encrypted == nil) {
+            return 0;
+        }
+        
+        memcpy(dataOut, [encrypted bytes], size);
+        
+        return 1;
+    }
+    else
+#endif
+    {
+        // Initialization vector; dummy in this case 0's.
+        uint8_t iv[kChosenCipherBlockSize];
+        memset((void *) iv, 0x0, (size_t) sizeof(iv));
+        
+        size_t movedBytes = 0;
+        
+        checkError( CCCrypt(  kCCEncrypt, kCCAlgorithmAES,
+                            0, //kCCOptionPKCS7Padding
+                            (const void *)m_dbKeyData,
+                            currentKeySize,
+                            iv,
+                            (const void *) data,
+                            size,
+                            (void *)dataOut,
+                            size,
+                            &movedBytes
+                            ) );
+        
+        return getErrorCode() == 0 ? 1 : 0;
+    }
 }
 
 int CRhoCryptImpl::db_decrypt( const char* szPartition, int size, unsigned char* data )
 {
     initContext(szPartition);
 	
-    // Initialization vector; dummy in this case 0's.
-    uint8_t iv[kChosenCipherBlockSize];
-    memset((void *) iv, 0x0, (size_t) sizeof(iv));
-	
-	size_t movedBytes = 0;
-	
-	checkError( CCCrypt(  kCCDecrypt, kCCAlgorithmAES,
-									   0, //kCCOptionPKCS7Padding
-									   (const void *)m_dbKeyData,
-									   currentKeySize,
-									   iv,
-									   (const void *) data,
-									   size,
-									   (void *)data,
-									   size,
-									   &movedBytes
-									   ) );
-	
-    return getErrorCode() == 0 ? 1 : 0;
+    
+#ifdef APP_BUILD_CAPABILITY_IOS_CRYPTO_FORCE_AES_GCM
+    
+    if ([swift_aes_gcm is_aes_gcm_available]) {
+        NSData* page = [NSData dataWithBytes:(const void *)data length:sizeof(unsigned char)*size];
+        NSData* key = [NSData dataWithBytes:(const void *)m_dbKeyData length:sizeof(unsigned char)*currentKeySize];
+        
+        NSData* decrypted = [swift_aes_gcm decrypt_page:page :key];
+        if (decrypted == nil) {
+            return 0;
+        }
+        
+        memcpy(data, [decrypted bytes], size);
+        
+        return 1;
+    }
+    else
+#endif
+    {
+        // Initialization vector; dummy in this case 0's.
+        uint8_t iv[kChosenCipherBlockSize];
+        memset((void *) iv, 0x0, (size_t) sizeof(iv));
+        
+        size_t movedBytes = 0;
+        
+        checkError( CCCrypt(  kCCDecrypt, kCCAlgorithmAES,
+                            0, //kCCOptionPKCS7Padding
+                            (const void *)m_dbKeyData,
+                            currentKeySize,
+                            iv,
+                            (const void *) data,
+                            size,
+                            (void *)data,
+                            size,
+                            &movedBytes
+                            ) );
+        
+        return getErrorCode() == 0 ? 1 : 0;
+    }
 }
 
 int CRhoCryptImpl::set_db_CryptKey( const char* szPartition, const char* szKey, bool bPersistent )

data/platform/shared/qt/RhoSimulator.pro

@@ -37,7 +37,7 @@ unix:!macx {
 }
 macx {
  SUBDIRS += curl
- QMAKE_MAC_SDK = macosx11.1
+ QMAKE_MAC_SDK = macosx12.1
 }
 
 win32{

data/platform/shared/qt/rhodes/rhodes.pro

@@ -10,19 +10,12 @@ isEqual(QT_MAJOR_VERSION, 5):{
     }
 
     equals(QT_MINOR_VERSION, 6) {
-        DEFINES += ENABLE_Q_WEB_ENGINE
-
-        !contains(DEFINES, ENABLE_Q_WEB_ENGINE)  {
-            QT += webkit
-            message(Deprecated sailfish webkit enabled)
-        }
-        contains(DEFINES, ENABLE_Q_WEB_ENGINE)  {
-            QT += webengine
-        }
+        QT += webkit
+        message(Deprecated sailfish webkit enabled)
 
         QT += quick multimedia dbus bluetooth
         DEFINES += OS_SAILFISH OS_LINUX
-        CONFIG += sailfishapp c++14 sailfishapp_i18n qmlcache
+        CONFIG += auroraapp c++14 auroraapp_i18n qmlcache
     }
     
     greaterThan(QT_MINOR_VERSION, 6): {
@@ -40,7 +33,7 @@ isEqual(QT_MAJOR_VERSION, 5):{
     TEMPLATE = app
 }
 contains(DEFINES, OS_SAILFISH)  {
-    TARGET = harbour-sailfishrhodes
+    TARGET = sailfishrhodes
     TEMPLATE = app
 }
 

data/platform/shared/qt/sailfish/SailfishRhodes.desktop

@@ -1,7 +1,6 @@
 [Desktop Entry]
 Type=Application
 X-Nemo-Application-Type=silica-qt5
-Icon=harbour-sailfishrhodes
-Exec=harbour-sailfishrhodes
-Name=harbour-sailfishrhodes
-
+Icon=sailfishrhodes
+Name=sailfishrhodes
+Exec=invoker --type=silica-qt5 -s /usr/bin/sailfishrhodes

data/platform/shared/qt/sailfish/SailfishRhodes.pro

@@ -1,6 +1,6 @@
-TARGET = harbour-sailfishrhodes
+TARGET = sailfishrhodes
 QT += webkit core network quick #widgets
-CONFIG += c++14 sailfishapp sailfishapp_i18n ordered
+CONFIG += c++14 auroraapp auroraapp_i18n ordered
 debug{
     CONFIG += force_debug_info
 }
@@ -17,16 +17,15 @@ data.path = $${DEPLOYMENT_PATH}
 
 INSTALLS += data
 
-DISTFILES += rpm/harbour-sailfishrhodes.changes.in \
-    rpm/harbour-sailfishrhodes.changes.run.in \
-    rpm/harbour-sailfishrhodes.spec \
-    rpm/harbour-sailfishrhodes.yaml \
-    harbour-sailfishrhodes.desktop \
+DISTFILES += rpm/sailfishrhodes.changes.in \
+    rpm/sailfishrhodes.changes.run.in \
+    rpm/sailfishrhodes.spec \
+    rpm/sailfishrhodes.yaml \
+    sailfishrhodes.desktop \
     translations/*.ts \
-    qml/harbour-sailfishrhodes.qml \
+    qml/sailfishrhodes.qml \
     qml/pages/MenuPage.qml \
-    privileges/harbour-sailfishrhodes \
-    qml/pages/FirstPageWE.qml \
+    privileges/sailfishrhodes \
     qml/pages/FirstPageWK.qml
 
 SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172

data/platform/shared/qt/sailfish/privileges/sailfishrhodes

@@ -0,0 +1,2 @@
+# Tells invoker to run sailfishrhodes as nemo:privileged
+/usr/bin/sailfishrhodes,

data/platform/shared/qt/sailfish/qml/pages/FirstPageWK.qml

@@ -1,9 +1,7 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
-import QtWebKit 3.0
 import QtMultimedia 5.5
-import QtWebKit.experimental 1.0
-import Nemo.KeepAlive 1.1
+import Nemo.KeepAlive 1.2
 
 Page {
     id: mainPage
@@ -109,7 +107,7 @@ Page {
                 height: parent.height
                 border.width: 1
 
-                WebView {
+                SilicaWebView  {
                     id: webView
                     url: modelData.url
                     anchors.fill: parent
@@ -155,16 +153,16 @@ Page {
                     }
 
                     onLoadingChanged: {
-                        if (loadRequest.status == WebView.LoadStartedStatus){
+                        if (loadRequest.status === WebView.LoadStartedStatus){
                             modelData.loadStarted();
                             modelData.messageReceived("Loading " + url + " started...");
                         }
-                        if (loadRequest.status == WebView.LoadSucceededStatus){
+                        if (loadRequest.status === WebView.LoadSucceededStatus){
                             rootDelegate.cover = ""
                             modelData.loadFinished(true);
                             modelData.messageReceived("Page " + url + " loaded!");
                         }
-                        if (loadRequest.status == WebView.LoadFailedStatus){
+                        if (loadRequest.status === WebView.LoadFailedStatus){
                             modelData.loadFinished(false);
                             modelData.messageReceived("Loading error: " + url + " : "+
                                                       loadRequest.errorCode.toString() + " " + loadRequest.errorString);
@@ -182,10 +180,7 @@ Page {
                     //experimental.preferences.webGLEnabled: true;
                     experimental.preferences.navigatorQtObjectEnabled: true;
                     experimental.preferences.offlineWebApplicationCacheEnabled: false;
-                    experimental.onMessageReceived: {
-                        modelData.messageReceived(message.data);
-                    }
-
+                    experimental.onMessageReceived: modelData.messageReceived(message.data);
                 }
             }
         }
@@ -234,3 +229,4 @@ Page {
         }
     }
 }
+

data/platform/shared/qt/sailfish/qml/{harbour-sailfishrhodes.qml → sailfishrhodes.qml}

@@ -8,7 +8,7 @@ ApplicationWindow
 
     Loader {
        id: firstPage
-       source: rootDelegate.webEngineEnabled ? "pages/FirstPageWE.qml" : "pages/FirstPageWK.qml"
+       source: "pages/FirstPageWK.qml"
     }
 
     initialPage: firstPage.item

data/platform/shared/qt/sailfish/rpm/sailfishrhodes.spec

@@ -0,0 +1,80 @@
+# 
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.32
+# 
+
+Name:       sailfishrhodes
+
+# >> macros
+# << macros
+
+%{!?qtc_qmake:%define qtc_qmake %qmake}
+%{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
+%{!?qtc_make:%define qtc_make make}
+%{?qtc_builddir:%define _builddir %qtc_builddir}
+Summary:    My Sailfish OS Application
+Version:    0.1
+Release:    1
+Group:      Qt/Qt
+License:    LICENSE
+URL:        http://example.org/
+Source0:    %{name}-%{version}.tar.bz2
+Source100:  sailfishrhodes.yaml
+Requires:   sailfishsilica-qt5 >= 0.10.9
+Requires:   qt5-qtconnectivity-qtsdpscanner
+BuildRequires:  pkgconfig(auroraapp) >= 1.0.2
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5WebKit)
+BuildRequires:  pkgconfig(Qt5Multimedia)
+BuildRequires:  pkgconfig(Qt5Bluetooth)
+BuildRequires:  qt5-qtqml-import-webkitplugin-experimental
+BuildRequires:  bluez5
+BuildRequires:  libbluez-qt5
+BuildRequires:  qt5-qtconnectivity-qtbluetooth
+BuildRequires:  desktop-file-utils
+
+%description
+Short description of my Sailfish OS Application
+
+
+%prep
+%setup -q -n %{name}-%{version}
+
+# >> setup
+# << setup
+
+%build
+# >> build pre
+# << build pre
+
+%qtc_qmake5 
+
+%qtc_make %{?_smp_mflags}
+
+# >> build post
+# << build post
+
+%install
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
+%qmake5_install
+
+# >> install post
+# << install post
+
+desktop-file-install --delete-original       \
+  --dir %{buildroot}%{_datadir}/applications             \
+   %{buildroot}%{_datadir}/applications/*.desktop
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/%{name}/data
+%{_datadir}/mapplauncherd/privileges.d/%{name}
+# >> files
+# << files

data/platform/shared/qt/sailfish/rpm/{harbour-sailfishrhodes.yaml → sailfishrhodes.yaml}

@@ -1,4 +1,4 @@
-Name: harbour-sailfishrhodes
+Name: sailfishrhodes
 Summary: My Sailfish OS Application
 Version: 0.1
 Release: 1
@@ -21,7 +21,7 @@ Builder: qtc5
 # This section specifies build dependencies that are resolved using pkgconfig.
 # This is the preferred way of specifying build dependencies for your package.
 PkgConfigBR:
-  - sailfishapp >= 1.0.2
+  - auroraapp >= 1.0.2
   - Qt5Core
   - Qt5Qml
   - Qt5WebKit

data/platform/shared/qt/sailfish/src/QtMainWindow.cpp

@@ -42,7 +42,7 @@
 #include "statistic/RhoProfiler.h"
 #include <QtNetwork/QNetworkCookie>
 #include <QDesktopServices>
-#include <sailfishapp.h>
+#include <auroraapp.h>
 #include "impl/MainWindowImpl.h"
 #include <QCameraInfo>
 #include <QCryptographicHash>

data/platform/shared/qt/sailfish/src/QtMainWindow.h

@@ -42,7 +42,7 @@
 #include "customwebviewtab.h"
 #include "customtoolbaritem.h"
 #include "rootdelegate.h"
-#include <sailfishapp.h>
+//#include <auroraapp.h>
 #include <QDesktopServices>
 
 class QtMainWindow : public QObject

data/platform/shared/qt/sailfish/src/main.cpp

@@ -1,4 +1,4 @@
-#include <sailfishapp.h>
+#include <auroraapp.h>
 #include <QObject>
 #include <QDebug>
 #include <QFileInfo>
@@ -19,11 +19,7 @@
 #include "impl/MainWindowImpl.h"
 #include "QtMainWindow.h"
 #include "QtLogView.h"
-#ifndef ENABLE_Q_WEB_ENGINE
 #include <QWebSettings>
-#else
-#include <QtWebEngine/QtWebEngine>
-#endif
 #include "../../platform/shared/qt/rhodes/RhoSimulator.h"
 
 using namespace rho;
@@ -95,18 +91,8 @@ int main(int argc, char *argv[])
 {
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
     QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps
-#ifdef ENABLE_Q_WEB_ENGINE
-    QString debugAddress;
-    foreach (const QHostAddress &address, QNetworkInterface::allAddresses()) {
-        if (address.protocol() == QAbstractSocket::IPv4Protocol && address != QHostAddress(QHostAddress::LocalHost) && debugAddress.isEmpty())
-        debugAddress = address.toString();
-    }
-    if (!debugAddress.isEmpty()){debugAddress.append(":");}
-    debugAddress.append("9090");
-    qputenv("QTWEBENGINE_REMOTE_DEBUGGING", debugAddress.toLocal8Bit());
-#endif
 
-    QScopedPointer<QGuiApplication> pApplication(SailfishApp::application(argc, argv));
+    QScopedPointer<QGuiApplication> pApplication(Aurora::Application::application(argc, argv));
     QGuiApplication * application = const_cast<QGuiApplication *>(pApplication.data());
     qRegisterMetaType<QString>("QString");
     qRegisterMetaType<rho::apiGenerator::CMethodResult>("rho::apiGenerator::CMethodResult");
@@ -116,32 +102,19 @@ int main(int argc, char *argv[])
         QString OSDetailsString= QString("Running on : %1 Application Compiled with QT Version :  %2 Running with QT Version %3")
     .arg(QtLogView::getOsDetails().toStdString().c_str(),QT_VERSION_STR,qVersion());
 
-    #ifdef ENABLE_Q_WEB_ENGINE
-    QtWebEngine::initialize();
-    QThread::currentThread()->setPriority(QThread::TimeCriticalPriority);
-    #endif
-
     qDebug() << "Executable file: " + QString::fromLocal8Bit(argv[0]);
-    QScopedPointer<QQuickView> pView(SailfishApp::createView());
+    QScopedPointer<QQuickView> pView(Aurora::Application::createView());
     QQuickView * view = const_cast<QQuickView * >(pView.data());
     RootDelegate::getInstance(view->rootContext()->engine())->moveToThread(view->rootContext()->engine()->thread());
     view->rootContext()->engine()->thread()->setPriority(QThread::TimeCriticalPriority);
 
-    #ifndef ENABLE_Q_WEB_ENGINE
-    /*QWebSettings::globalSettings( )->setAttribute( QWebSettings::PrivateBrowsingEnabled, true );
-    QWebSettings::globalSettings( )->setAttribute( QWebSettings::LocalContentCanAccessRemoteUrls, true );
-    QWebSettings::globalSettings( )->setAttribute( QWebSettings::OfflineWebApplicationCacheEnabled, true );
-    QWebSettings::setMaximumPagesInCache( 0 );
-    QWebSettings::setObjectCacheCapacities( 0, 0, 0 );
-    QWebSettings::clearMemoryCaches( );*/
-    #endif
     QtMainWindow::setView(view);
     CMainWindow* m_appWindow = CMainWindow::getInstance();
 
     // Create the main application window
-    QObject::connect(view, &QQuickView::activeChanged, [=](){qDebug() << (view->isActive()?"Active":"Not active");});
+    QObject::connect(view, &QQuickView::activeChanged, [=](){qDebug() << ( view->isActive()? "Active" : "Not active" );});
     QObject::connect(view->engine(), &QQmlEngine::quit, application, &QGuiApplication::quit);
-    qDebug() << "Main path to QML: " + SailfishApp::pathToMainQml().toString();
+    qDebug() << "Main path to QML: " + Aurora::Application::pathToMainQml().toString();
 
     qDebug() << "Writable location is: " + QStandardPaths::writableLocation(QStandardPaths::DataLocation);
     const QByteArray dir = QStandardPaths::writableLocation(QStandardPaths::DataLocation).toLatin1();
@@ -189,7 +162,7 @@ int main(int argc, char *argv[])
 
     m_appWindow->Initialize(convertToStringW(RHODESAPP().getAppTitle()).c_str());
     view->rootContext()->setContextProperty("rootDelegate", RootDelegate::getInstance());
-    view->setSource(SailfishApp::pathToMainQml());
+    view->setSource(Aurora::Application::pathToMainQml());
     view->showFullScreen();
     RHODESAPP().startApp();
     //QTimer::singleShot(1000, ()[&]{rho_rhodesapp_callUiCreatedCallback();});
@@ -198,11 +171,6 @@ int main(int argc, char *argv[])
     if (RHOCONF().getString("test_push_client").length() > 0 )
         rho_clientregister_create(RHOCONF().getString("test_push_client").c_str());//"qt_client");
 
-#ifdef ENABLE_Q_WEB_ENGINE
-    debugAddress.prepend("Debug address is ");
-    RAWLOGC_INFO("QTMain", debugAddress.toStdString().c_str());
-#endif
-
     application->exec();
 
     QtMainWindow::doExit(false);

data/platform/shared/qt/sailfish/src/rootdelegate.h

@@ -2,14 +2,12 @@
 #define ROOTDELEGATE_H
 
 #include <QObject>
-#include <sailfishapp.h>
 #include <QCoreApplication>
 
 class RootDelegate : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString cover READ getCover WRITE setCover NOTIFY coverChanged)
-    Q_PROPERTY(bool webEngineEnabled READ getWebEngineEnabled CONSTANT)
 public:
     static RootDelegate * getInstance(QObject * parent = 0){
         static RootDelegate * instance = new RootDelegate(parent);
@@ -17,17 +15,10 @@ public:
     }
 
     QString cover;
-    bool webEngineEnabled;
-
-
 private:
     explicit RootDelegate(QObject *parent = 0) : QObject(parent)
     {
-#ifndef ENABLE_Q_WEB_ENGINE
-        webEngineEnabled = false;
-#else
-        webEngineEnabled = true;
-#endif
+
     }
 signals:
     void coverChanged();
@@ -42,10 +33,7 @@ public slots:
         cover = value;
         coverChanged();
     }
-    bool getWebEngineEnabled() const
-    {
-        return webEngineEnabled;
-    }
+
 };
 
 #endif // ROOTDELEGATE_H