rhodes 7.1.17 → 7.4.1

data/platform/shared/qt/rhodes/newVersion/QtMainWindow.cpp

@@ -52,6 +52,7 @@
 #include <QScroller>
 #include <QScrollArea>
 #include <QWebEngineSettings>
+#include <QApplication>
 #include "../guithreadfunchelper.h"
 #include "WebUrlRequestInterceptor.h"
 
@@ -152,7 +153,6 @@ QtMainWindow::QtMainWindow(QWidget *parent) : QMainWindow(parent), mainWindowCal
     QWebEngineProfile::defaultProfile()->setRequestInterceptor(wuri);
 
     QApplication::setStyle(new QtCustomStyle());
-
     setCentralWidget(new QWidget(this));
     verticalLayout = new QVBoxLayout(centralWidget());
 
@@ -310,14 +310,28 @@ void QtMainWindow::showEvent(QShowEvent *)
 
 void QtMainWindow::closeEvent(QCloseEvent *ce)
 {
-    if ( rho_ruby_is_started() )
-        rb_thread_wakeup(rb_thread_main());
+    if (!acceptClosing){
+        acceptClosing = rho_rhodesapp_callUiCloseRequestCallback() == 0 ? false : true;
+    }
 
-    if (mainWindowCallback) mainWindowCallback->onWindowClose();
-    tabbarRemoveAllTabs(false);
-    if (m_logView)
-        m_logView->close();
-    QMainWindow::closeEvent(ce);
+    if (acceptClosing){
+        if ( rho_ruby_is_started() )
+            rb_thread_wakeup(rb_thread_main());
+
+        if (mainWindowCallback) mainWindowCallback->onWindowClose();
+        tabbarRemoveAllTabs(false);
+        if (m_logView)
+            m_logView->close();
+
+        QTimer::singleShot(1, this, [&]{rho_rhodesapp_callUiDestroyedCallback();});
+        QTimer::singleShot(1000, this, [&]{rho::common::CRhodesApp::Destroy();});
+        QTimer::singleShot(3000, this, [this, ce]{
+            ce->accept();
+            QMainWindow::closeEvent(ce);
+        });
+    }else{
+        ce->setAccepted(false);
+    }
 
 }
 
@@ -383,7 +397,7 @@ void QtMainWindow::on_actionRotate180_triggered()
 
 void QtMainWindow::on_actionExit_triggered()
 {
-    this->close();
+    this->close();       
 }
 
 bool QtMainWindow::internalUrlProcessing(const QUrl& url)
@@ -950,6 +964,7 @@ void QtMainWindow::on_actionAbout_triggered()
 
 void QtMainWindow::exitCommand()
 {
+    acceptClosing = true;
     this->close();
 }
 
@@ -1192,7 +1207,7 @@ void QtMainWindow::takeSignature(void*) //TODO: Signature::Params*
 
 void QtMainWindow::fullscreenCommand(int enable)
 {
-#if defined(OS_WINDOWS_DESKTOP) && !defined(RHODES_EMULATOR)
+#if (defined(OS_WINDOWS_DESKTOP) && !defined(RHODES_EMULATOR))  || defined(OS_LINUX)
     if ((enable && !isFullScreen()) || (!enable && isFullScreen())) {
         this->menuBar()->setVisible(RHOCONF().getBool("w32_fullscreen_menu") || (!enable));
 

data/platform/shared/qt/rhodes/newVersion/QtMainWindow.h

@@ -124,7 +124,7 @@ private:
     void doAlertCallback(CAlertParams* params, int btnNum, CAlertParams::CAlertButton &button);
     void internalSetProxy();
     QMenuBar* createMenu();
-
+    bool acceptClosing = false;
 
 private:
     IMainWindowCallback* mainWindowCallback;

data/platform/shared/qt/rhodes/newVersion/{qtwebenginepage.cpp → QtWebEnginePage.cpp}

@@ -1,4 +1,4 @@
-#include "qtwebenginepage.h"
+#include "QtWebEnginePage.h"
 
 QtWebEnginePage::QtWebEnginePage(QObject *parent) : QWebEnginePage(parent){
 

data/platform/shared/qt/rhodes/newVersion/{qtwebengineview.cpp → QtWebEngineView.cpp}

@@ -1,4 +1,4 @@
-#include "qtwebengineview.h"
+#include "QtWebEngineView.h"
 
 
 QtWebEngineView::QtWebEngineView(QWidget *parent) : QWebEngineView(parent)

data/platform/shared/qt/rhodes/newVersion/WebUrlRequestInterceptor.cpp

@@ -1,7 +1,7 @@
 #include "WebUrlRequestInterceptor.h"
 #include "common/RhoDefs.h"
 
-#if defined(OS_WINDOWS_DESKTOP)
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_LINUX)
 #include "impl/SecurityTokenGeneratorImpl.h"
 #include "common/IRhoClassFactory.h"
 #include "common/RhoConf.h"
@@ -14,7 +14,7 @@ WebUrlRequestInterceptor::WebUrlRequestInterceptor(QObject *p):QWebEngineUrlRequ
 }
 void WebUrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info) {
 
-#if defined(OS_WINDOWS_DESKTOP)
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_LINUX)
     const rho::common::ISecurityTokenGenerator* generator = rho_conf_getInt("disable_external_access") ? 
         rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
     if(generator)

data/platform/shared/qt/rhodes/newVersion/main.cpp

@@ -287,12 +287,11 @@ int main(int argc, char *argv[])
     app.exec();
 
     // stopping Rhodes application
-    rho_ringtone_manager_stop();
-
-    m_appWindow->DestroyUi();
-
-    rho::common::CRhodesApp::Destroy();
-
+    //rho_ringtone_manager_stop(); not implemented.
+    #ifdef OS_SAILFISH
+        m_appWindow->DestroyUi();
+        rho::common::CRhodesApp::Destroy();
+    #endif
     return 0;
 }
 

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

@@ -9,25 +9,22 @@ isEqual(QT_MAJOR_VERSION, 5):{
         INCLUDEPATH += oldVersion
     }
 
-    equals(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 += quick multimedia dbus bluetooth
-            DEFINES += OS_SAILFISH OS_LINUX
-            CONFIG += sailfishapp c++14 sailfishapp_i18n qmlcache
-        }
-    }
+    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 += quick multimedia dbus bluetooth
+        DEFINES += OS_SAILFISH OS_LINUX
+        CONFIG += sailfishapp c++14 sailfishapp_i18n qmlcache
+    }
+    
     greaterThan(QT_MINOR_VERSION, 6): {
         QT += webengine webenginecore webenginewidgets multimedia multimediawidgets
         message(Webengine enabled)
@@ -138,18 +135,30 @@ win32 {
                     ../../../win32/bin/rholib/rholib.lib\
                     ../../../win32/bin/sqlite3/sqlite3.lib\
                     ../../../win32/bin/syncengine/syncengine.lib
-  exists("../../../win32/bin/extensions/extensions.pri") {
+  #exists("../../../win32/bin/extensions/extensions.pri") {
     include("../../../win32/bin/extensions/extensions.pri")
-  }
+  #}
 }
 
 unix:!macx {
-!contains(DEFINES, OS_SAILFISH) {
+  TEMPLATE = app
+  #QMAKE_LFLAGS += -no-pie
+  !contains(DEFINES, OS_SAILFISH) {
   DESTDIR = $$PWD/../../../linux/bin/RhoSimulator
-}
-contains(DEFINES, OS_SAILFISH) {
-  #DESTDIR = $$PWD/../Build_Sailfish_Application
-}
+      LIBS += ../../../linux/bin/rubylib/librubylib.a\
+           ../../../linux/bin/rholib/librholib.a\
+           ../../../linux/bin/sqlite3/libsqlite3.a\
+           ../../../linux/bin/syncengine/libsyncengine.a\
+           ../../../linux/bin/curl/libcurl.a
+
+      PRE_TARGETDEPS += ../../../linux/bin/rubylib/librubylib.a\
+                      ../../../linux/bin/rholib/librholib.a\
+                      ../../../linux/bin/sqlite3/libsqlite3.a\
+                      ../../../linux/bin/syncengine/libsyncengine.a\
+                      ../../../linux/bin/curl/libcurl.a
+      #DESTDIR = $$PWD/../Build_Sailfish_Application
+  }
+
   MOC_DIR = $$PWD/../../../linux/bin/RhoSimulator/generated_files
   UI_DIR = $$PWD/../../../linux/bin/RhoSimulator/generated_files
   OBJECTS_DIR = $$PWD/../../../linux/bin/RhoSimulator/tmp
@@ -158,23 +167,18 @@ contains(DEFINES, OS_SAILFISH) {
   SOURCES += $$PWD/../../net/linux/SSLImpl.cpp\
   ../../../../lib/commonAPI/coreapi/ext/platform/qt/src/CSystemImpl.cpp
   INCLUDEPATH += ../../curl/include\
-  #../../ruby/linux\
-  LIBS += -lpthread
-  LIBS += -ldl -lz
-  #LIBS += -L../../../linux/bin/extensions -lcoreapi
+  ../../ruby/linux
+
+
   LIBS += -L../../../linux/bin/sqlite3 -lsqlite3
-  #LIBS += -L../../../linux/bin/curl -lcurl
-  #LIBS += -L../../../linux/bin/rubylib -lrubylib
-  #LIBS += -L../../../linux/bin/rholib -lrholib
-  #LIBS += -L../../../linux/bin/syncengine -lsyncengine
-  #PRE_TARGETDEPS += \
-  #../../../linux/bin/rubylib/librubylib.a\
-  #../../../linux/bin/curl/libcurl.a\
-  #../../../linux/bin/rholib/librholib.a\
-  #../../../linux/bin/sqlite3/libsqlite3.a\
-  #../../../linux/bin/extensions/libcoreapi.a\
-  #../../../linux/bin/syncengine/libsyncengine.a
+
   DEFINES += QT_LARGEFILE_SUPPORT QT_CORE_LIB QT_GUI_LIB QT_NETWORK_LIB QT_WEBKIT_LIB OS_LINUX
+
+  QMAKE_CFLAGS += -fvisibility=hidden
+  QMAKE_CXXFLAGS += -fvisibility=hidden
+
+  #QMAKE_CFLAGS_RELEASE -= -O2
+  #QMAKE_CXXFLAGS_RELEASE -= -O2
 }
 
   DEFINES += RHODES_QT_PLATFORM
@@ -328,6 +332,7 @@ newVersion/ExternalWebView.cpp\
 newVersion/DateTimeDialog.cpp\
 newVersion/main.cpp\
 newVersion/WebUrlRequestInterceptor.cpp
+
 }
 
 contains(DEFINES, RHODES_VERSION_LIBRARY) {
@@ -370,49 +375,60 @@ SOURCES +=\
 RESOURCES += resources/common.qrc
 }
 
-contains(DEFINES, OS_SAILFISH)  {
-unix:!macx:
-LIBS += -L$$PWD/../../../linux/bin/sqlite3/ -lsqlite3
-INCLUDEPATH += $$PWD/../../sqlite
-DEPENDPATH += $$PWD/../../sqlite
+contains(DEFINES, OS_LINUX)  {
+    SOURCES +=  $$PWD/../../net/ssl.cpp
+
+    LIBS += -lz
+    LIBS += -L$$PWD/../../../linux/bin/sqlite3/ -lsqlite3
+    INCLUDEPATH += $$PWD/../../sqlite
+    DEPENDPATH += $$PWD/../../sqlite
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/curl/ -lcurl
-INCLUDEPATH += $$PWD/../../curl/include
-DEPENDPATH += $$PWD/../../curl/include
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/curl/libcurl.a\
+    LIBS += -L$$PWD/../../../linux/bin/curl/ -lcurl
+    INCLUDEPATH += $$PWD/../../curl/include
+    DEPENDPATH += $$PWD/../../curl/include
+    PRE_TARGETDEPS += $$PWD/../../../linux/bin/curl/libcurl.a
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/rubylib/ -lrubylib
-INCLUDEPATH += $$PWD/../../ruby/include
-DEPENDPATH += $$PWD/../../ruby/include
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/rubylib/librubylib.a
+    LIBS += -L$$PWD/../../../linux/bin/rubylib/ -lrubylib
+    INCLUDEPATH += $$PWD/../../ruby/include
+    DEPENDPATH += $$PWD/../../ruby/include
+    PRE_TARGETDEPS += $$PWD/../../../linux/bin/rubylib/librubylib.a
+
+    LIBS += -L$$PWD/../../../linux/bin/rholib/ -lrholib -lcurl
+    PRE_TARGETDEPS += $$PWD/../../../linux/bin/rholib/librholib.a
+
+    LIBS += -L$$PWD/../../../linux/bin/syncengine/ -lsyncengine -lsqlite3
+    PRE_TARGETDEPS += $$PWD/../../../linux/bin/syncengine/libsyncengine.a
+
+    #LIBS += -L$$PWD/../../../linux/bin/extensions/ -lcoreapi
+    #PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libcoreapi.a
+
+    exists("../../../linux/bin/extensions/extensions.pri") {
+        include("../../../linux/bin/extensions/extensions.pri")
+    }
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/rholib/ -lrholib -lcurl
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/rholib/librholib.a
+    #LIBS += -L$$PWD/../../../linux/bin/extensions/ -lzlib
+    #PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libzlib.a
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/syncengine/ -lsyncengine -lsqlite3
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/syncengine/libsyncengine.a
+    #LIBS += -lstatic-libgcc
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lcoreapi
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libcoreapi.a
+    #unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lMediacapture
+    #unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libMediacapture.a
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lzlib
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libzlib.a
+    #unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lBarcode
+    #unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libBarcode.a
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lMediacapture
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libMediacapture.a
+    #unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lSignature
+    #unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libSignature.a
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lBarcode
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libBarcode.a
+    #unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lRhoconnect-client
+    #unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libRhoconnect-client.a
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lSignature
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libSignature.a
+    #unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lserialport
+    #unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libserialport.a
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lRhoconnect-client
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libRhoconnect-client.a
+    #unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lbluetooth
+    #unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libbluetooth.a
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lserialport
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libserialport.a
+    LIBS += -ldl -lgmp -lc -lpthread -lz
 
-unix:!macx: LIBS += -L$$PWD/../../../linux/bin/extensions/ -lbluetooth
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../../linux/bin/extensions/libbluetooth.a
 }

data/platform/shared/qt/rholib/rholib.pro

@@ -1,19 +1,19 @@
-greaterThan(QT_MINOR_VERSION, 6): {
-    CONFIG += c++14
-    DEFINES += RHODES_VERSION_2
-    DEFINES += AJAXSERVER
-}
-
 equals(QT_MAJOR_VERSION, 5) {
-    equals(QT_MINOR_VERSION, 6) {
-        DEFINES += OS_SAILFISH
+    lessThan(QT_MINOR_VERSION, 6): {
+        DEFINES += RHODES_VERSION_1
+    }
+    equals(QT_MINOR_VERSION, 6): {
+        DEFINES += OS_SAILFISH OS_LINUX
+        CONFIG +=  c++14
         QT += core
     }
+    greaterThan(QT_MINOR_VERSION, 7): {
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN RHODES_VERSION_2 AJAXSERVER
+    }
 }
 
-lessThan(QT_MINOR_VERSION, 6): {
-    DEFINES += RHODES_VERSION_1
-}
+
 
 TARGET = rholib
 TEMPLATE = lib
@@ -70,20 +70,28 @@ win32 {
 }
 
 unix:!macx {
-  DESTDIR = $$PWD/../../../linux/bin/rholib
-  OBJECTS_DIR = $$PWD/../../../linux/bin/rholib/tmp
-  INCLUDEPATH += $$PWD/../../curl/include
-  DEFINES += _GNU_SOURCE
-  HEADERS += $$PWD/../../common/PosixThreadImpl.h\
-  $$PWD/../../net/CURLNetRequest.h\
-  $$PWD/../../net/ssl.h
-  SOURCES += $$PWD/../../common/PosixThreadImpl.cpp\
-  $$PWD/../../net/CURLNetRequest.cpp\
-  $$PWD/../../net/ssl.cpp
-  DEFINES += OS_SAILFISH OS_LINUX
-
-  QMAKE_CFLAGS += -fvisibility=hidden
-  QMAKE_CXXFLAGS += -fvisibility=hidden
+    INCLUDEPATH += $$PWD/../../ruby/linux
+    HEADERS += $$PWD/../../ruby/linux/ruby/config.h
+    DESTDIR = $$PWD/../../../linux/bin/rholib
+    OBJECTS_DIR = $$PWD/../../../linux/bin/rholib/tmp
+    INCLUDEPATH += $$PWD/../../curl/include
+    DEFINES += _GNU_SOURCE
+    HEADERS += $$PWD/../../common/PosixThreadImpl.h\
+    $$PWD/../../net/CURLNetRequest.h\
+    $$PWD/../../net/ssl.h
+    SOURCES += $$PWD/../../common/PosixThreadImpl.cpp\
+    $$PWD/../../net/CURLNetRequest.cpp#\
+    #$$PWD/../../net/ssl.cpp
+    DEFINES += OS_LINUX
+
+    HEADERS += $$PWD/../../net/linux/SSLImpl.h
+    SOURCES += $$PWD/../../net/linux/SSLImpl.cpp
+
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
+
+    #QMAKE_CFLAGS_RELEASE -= -O2
+    #QMAKE_CXXFLAGS_RELEASE -= -O2
 }
 
 DEFINES += RHODES_QT_PLATFORM

data/platform/shared/qt/rhoruby_win32_build.bat

@@ -3,7 +3,7 @@ setlocal
 
 cd /d "%~dp0"
 
-call "%RHO_VSCMNTOOLS%..\..\VC\vcvarsall.bat" x86
+call %RHO_VSCMNTOOLS%
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
 
 rem "%QTDIR%\bin\qmake" -o Makefile -r -spec %RHO_QMAKE_SPEC% "CONFIG+=debug" "CONFIG-=release" "%1" RhoRubylib.pro

data/platform/shared/qt/rhoruby_win32_build_debug.bat

@@ -3,7 +3,7 @@ setlocal
 
 cd /d "%~dp0"
 
-call "%RHO_VSCMNTOOLS%..\..\VC\vcvarsall.bat" x86
+call %RHO_VSCMNTOOLS%
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
 
 rem "%QTDIR%\bin\qmake" -o Makefile -r -spec %RHO_QMAKE_SPEC% "CONFIG+=debug" "CONFIG-=release" "%1" RhoRubylib.pro

data/platform/shared/qt/rhosimulator_win32_build.bat

@@ -3,7 +3,7 @@ setlocal
 
 cd /d "%~dp0"
 
-call "%RHO_VSCMNTOOLS%..\..\VC\vcvarsall.bat" x86
+call %RHO_VSCMNTOOLS%
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
 
 rem "%QTDIR%\bin\qmake" -o Makefile -r -spec %RHO_QMAKE_SPEC% "CONFIG+=debug" "CONFIG-=release" "%1" RhoSimulator.pro

data/platform/shared/qt/rhosimulator_win32_build_debug.bat

@@ -3,7 +3,7 @@ setlocal
 
 cd /d "%~dp0"
 
-call "%RHO_VSCMNTOOLS%..\..\VC\vcvarsall.bat" x86
+call %RHO_VSCMNTOOLS%
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
 
 rem "%QTDIR%\bin\qmake" -o Makefile -r -spec %RHO_QMAKE_SPEC% "CONFIG+=debug" "CONFIG-=release" "%1" RhoSimulator.pro

data/platform/shared/qt/rubylib/rubylib.pro

@@ -1,24 +1,23 @@
-greaterThan(QT_MINOR_VERSION, 6): {
-    CONFIG += c++14
-    DEFINES += RHODES_VERSION_2
-    QMAKE_CXXFLAGS += -nologo -DNT=1 -ML -Zi -O2b2x -G5
-    LIBS += -lmsvcrt.lib
-    LIBS += -lvcruntime.lib
-    LIBS += -lucrt.lib
-}
-
-
 equals(QT_MAJOR_VERSION, 5) {
+    lessThan(QT_MINOR_VERSION, 6): {
+        DEFINES += RHODES_VERSION_1
+    }
     equals(QT_MINOR_VERSION, 6) {
         QT += core
         DEFINES += OS_SAILFISH OS_LINUX CPP_ELEVEN
         CONFIG += c++14
     }
+    greaterThan(QT_MINOR_VERSION, 6): {
+      CONFIG += c++14
+      DEFINES += RHODES_VERSION_2
+      QMAKE_CXXFLAGS += -nologo -DNT=1 -ML -Zi -O2b2x -G5
+      LIBS += -lmsvcrt.lib
+      LIBS += -lvcruntime.lib
+      LIBS += -lucrt.lib
+  }
 }
 
-lessThan(QT_MINOR_VERSION, 6): {
-    DEFINES += RHODES_VERSION_1
-}
+
 TARGET = rubylib
 TEMPLATE = lib
 
@@ -104,28 +103,32 @@ win32 {
 }
 
 unix:!macx {
-  DESTDIR = $$PWD/../../../linux/bin/rubylib
-  OBJECTS_DIR = $$PWD/../../../linux/bin/rubylib/tmp
-  INCLUDEPATH += $$PWD/../../ruby/sailfish
-  HEADERS += $$PWD/../../ruby/sailfish/ruby/config.h
-  SOURCES += \
-#../../ruby/miniprelude.c\
-../../ruby/missing/acosh.c\
-../../ruby/missing/cbrt.c\
-../../ruby/missing/crypt.c\
-../../ruby/missing/dup2.c\
-../../ruby/missing/erf.c\
-../../ruby/missing/hypot.c\
-../../ruby/missing/stdlib.c\
-../../ruby/missing/strlcat.c\
-../../ruby/missing/strlcpy.c\
-../../ruby/missing/tgamma.c\
-../../ruby/newline.c\
-../../ruby/missing/explicit_bzero.c\
-../../ruby/missing/setproctitle.c
+    DEFINES += OS_LINUX
+    DESTDIR = $$PWD/../../../linux/bin/rubylib
+    OBJECTS_DIR = $$PWD/../../../linux/bin/rubylib/tmp
+    INCLUDEPATH += $$PWD/../../ruby/linux
+    HEADERS += $$PWD/../../ruby/linux/ruby/config.h
+    SOURCES += \
+        #../../ruby/miniprelude.c\
+        ../../ruby/missing/acosh.c\
+        ../../ruby/missing/cbrt.c\
+        ../../ruby/missing/crypt.c\
+        ../../ruby/missing/dup2.c\
+        ../../ruby/missing/erf.c\
+        ../../ruby/missing/hypot.c\
+        ../../ruby/missing/stdlib.c\
+        ../../ruby/missing/strlcat.c\
+        ../../ruby/missing/strlcpy.c\
+        ../../ruby/missing/tgamma.c\
+        ../../ruby/newline.c\
+        ../../ruby/missing/explicit_bzero.c\
+        ../../ruby/missing/setproctitle.c
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
+
+    QMAKE_CFLAGS_RELEASE -= -O2
+    QMAKE_CXXFLAGS_RELEASE -= -O2
 
-  QMAKE_CFLAGS += -fvisibility=hidden
-  QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 
 DEFINES += RHODES_QT_PLATFORM

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

@@ -29,7 +29,7 @@ DISTFILES += rpm/harbour-sailfishrhodes.changes.in \
     qml/pages/FirstPageWE.qml \
     qml/pages/FirstPageWK.qml
 
-SAILFISHAPP_ICONS = 86x86 108x108 128x128
+SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
 
 #INCLUDEPATH += $$PWD/../../../../wm/rhodes
 #INCLUDEPATH += $$PWD/../../curl/include