rhodes 7.4.1 → 7.6.0

data/platform/shared/common/RhodesApp.cpp

@@ -73,6 +73,13 @@ bool rho_wmimpl_is_browser_ieforwm();
 void rho_file_set_fs_mode(int mode);
 #endif
 
+#ifdef OS_MACOSX
+#ifndef RHODES_EMULATOR
+void rho_cocoa_server_init();
+void rho_cocoa_server_start();
+#endif
+#endif
+
 }
 
 // Copy-paste from ApplicationBase.cpp
@@ -196,10 +203,14 @@ void CAppCallbacksQueue::callCallback(const String& strCallback)
     strUrl += strCallback;
     
     boolean force_https = false;
+    boolean force_custom_protocol = false;
 #ifdef OS_MACOSX
     if (rho_conf_is_property_exists("ios_https_local_server")!=0) {
         force_https = rho_conf_getBool("ios_https_local_server")!=0;
     }
+    if (rho_conf_is_property_exists("ios_direct_local_requests_with_custom_protocol")!=0) {
+        force_custom_protocol = rho_conf_getBool("ios_direct_local_requests_with_custom_protocol")!=0;
+    }
 #endif
     
     NetResponse resp = getNetRequest().pullData( strUrl, NULL );
@@ -215,13 +226,19 @@ void CAppCallbacksQueue::callCallback(const String& strCallback)
 #else
         String addr_number;
         String addr_local;
-        if (force_https) {
-            addr_number = "https";
-            addr_local = "https";
+        if (force_custom_protocol) {
+            addr_number = "rhoctp";
+            addr_local = "rhoctp";
         }
         else {
-            addr_number = "http";
-            addr_local = "http";
+            if (force_https) {
+                addr_number = "https";
+                addr_local = "https";
+            }
+            else {
+                addr_number = "http";
+                addr_local = "http";
+            }
         }
         addr_number = addr_number + "://127.0.0.1:";
         addr_local = addr_local + "://localhost:";
@@ -561,14 +578,31 @@ void CRhodesApp::run()
 
 #ifdef OS_MACOSX
   bool shouldRunDirectQueue = false;
+  bool shouldUseCocoaServer = true;
+    
   net::CDirectHttpRequestQueue directQueue(*m_httpServer, *this );
 
     if (RHOCONF().isExist("ios_direct_local_requests")) {
         shouldRunDirectQueue = RHOCONF().getBool("ios_direct_local_requests");
     }
+    if (RHOCONF().isExist("ios_direct_local_requests_with_custom_protocol")) {
+        shouldRunDirectQueue = shouldRunDirectQueue || RHOCONF().getBool("ios_direct_local_requests_with_custom_protocol");
+        
+    }
+    if (RHOCONF().isExist("ios_use_old_legacy_socket")) {
+        shouldUseCocoaServer = !RHOCONF().getBool("ios_use_old_legacy_socket");
+    }
 #ifdef RHODES_EMULATOR
     shouldRunDirectQueue = false;
+    shouldUseCocoaServer = false;
 #endif
+
+    if ((shouldUseCocoaServer) && (!shouldRunDirectQueue)) {
+#ifndef RHODES_EMULATOR
+        rho_cocoa_server_init();
+#endif
+    }
+
 #endif
 
 
@@ -576,8 +610,13 @@ void CRhodesApp::run()
 		if(!m_isJSFSApp)
     {
 #ifdef OS_MACOSX
-      if ( shouldRunDirectQueue )
+      if ( shouldRunDirectQueue || shouldUseCocoaServer)
       {
+          if ((shouldUseCocoaServer) && (!shouldRunDirectQueue)) {
+#ifndef RHODES_EMULATOR
+              rho_cocoa_server_start();
+#endif
+          }
         directQueue.run();
       }
       else
@@ -1807,10 +1846,14 @@ void CRhodesApp::initAppUrls()
 #endif
 
     boolean force_https = false;
+    boolean force_custom_protocol = false;
 #ifdef OS_MACOSX
     if (rho_conf_is_property_exists("ios_https_local_server")!=0) {
         force_https = rho_conf_getBool("ios_https_local_server")!=0;
     }
+    if (rho_conf_is_property_exists("ios_direct_local_requests_with_custom_protocol")!=0) {
+        force_custom_protocol = rho_conf_getBool("ios_direct_local_requests_with_custom_protocol")!=0;
+    }
 #endif
 
 #ifdef OS_ANDROID
@@ -1818,12 +1861,18 @@ void CRhodesApp::initAppUrls()
        force_https = value && strcmp(value, "1") == 0;
 #endif
 
-    if (force_https) {
-        m_strHomeUrl = "https://127.0.0.1:";
+    if (force_custom_protocol) {
+        m_strHomeUrl = "rhoctp://127.0.0.1:";
     }
     else {
-        m_strHomeUrl = "http";
-        m_strHomeUrl = m_strHomeUrl + "://127.0.0.1:";
+        
+        if (force_https) {
+            m_strHomeUrl = "https://127.0.0.1:";
+        }
+        else {
+            m_strHomeUrl = "http";
+            m_strHomeUrl = m_strHomeUrl + "://127.0.0.1:";
+        }
     }
     
     m_strRubyServerHomeURL = m_strHomeUrl+getFreeListeningPort();

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/net/HttpServer.cpp

@@ -95,6 +95,19 @@ typedef unsigned __int16 uint16_t;
 
 #endif
 
+
+
+#ifdef OS_MACOSX
+#ifndef RHODES_EMULATOR
+
+extern "C" {
+    void rho_cocoa_server_stop();
+}
+
+#endif
+#endif
+
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "HttpServer"
 
@@ -511,6 +524,13 @@ void CHttpServer::close_listener()
 
 void CHttpServer::stop()
 {
+    
+#ifdef OS_MACOSX
+#ifndef RHODES_EMULATOR
+    rho_cocoa_server_stop();
+#endif
+#endif
+    
     // WARNING!!! It is not enough to just close listener on Android
     // to stop server. By unknown reason accept does not unblock if
     // it was closed in another thread. However, on iPhone it works

data/platform/shared/qt/RhoSimulator.pro

@@ -37,7 +37,7 @@ unix:!macx {
 }
 macx {
  SUBDIRS += curl
- QMAKE_MAC_SDK = macosx10.13
+ 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