finalizer

.gitignore

@@ -73,3 +73,5 @@ CMakeLists.txt.user*
 *.exe
 
 build
+lib/linux-x86_64
+lib/*.zip

CMakeLists.txt

@@ -23,6 +23,7 @@ add_library(rktwebview SHARED
   json.cpp json.h
   utils.h
   utils.cpp
+  memqueue.h memqueue.cpp
 )
 
 add_executable(rktwebview_prg

command.h

@@ -28,6 +28,7 @@
 #define COMMAND_SET_OU_TOKEN     22
 #define COMMAND_NEW_CONTEXT      23
 #define COMMAND_MESSAGE          24
+#define COMMAND_SET_ICON         25
 
 class Command
 {

install/install-linux.sh

@@ -2,20 +2,21 @@
 #
 ARCH=`uname -m`
 
-LIB="lib/linux/$ARCH"
+LIB="../lib/linux-$ARCH"
+BUILD="../build/Release"
 
 mkdir -p $LIB
 rm -f $LIB/*.so*
-cp build/Release/*.so $LIB
-cp build/Release/rktwebview_prg $LIB
+cp $BUILD/*.so $LIB
+cp $BUILD/rktwebview_prg $LIB
 
-QT_PATH=`ldd build/Release/rktwebview_prg | grep Qt | awk '{print $3}' | head -1 | sed -e 's%[/]lib[/].*%%'`
+QT_PATH=`ldd $BUILD/rktwebview_prg | grep Qt | awk '{print $3}' | head -1 | sed -e 's%[/]lib[/].*%%'`
 echo "QT_PATH=$QT_PATH"
 
 QT_PLUGINS="$QT_PATH/plugins"
 PLUGINS="platforms position generic iconengines imageformats qmltooling tls xcbglintegrations"
 
-EXTRA_LIBS_SO=`ldd build/Release/rktwebview_prg | grep Qt | awk '{ print $3 }'`
+EXTRA_LIBS_SO=`ldd $BUILD/rktwebview_prg | grep Qt | awk '{ print $3 }'`
 EXTRA_LIBS_PLATFORM_PLUGIN_XCB=`ldd $QT_PATH/plugins/platforms/libqxcb.so | grep Qt | awk '{print $3}'`
 
 for pl in $PLUGINS
@@ -63,4 +64,8 @@ done
 
 cp $QT_PATH/libexec/QtWebEngineProcess $LIB
 
+(cd $LIB; cd ..; zip -9 -y -r linux-$ARCH.zip linux-$ARCH)
+
+
+
 

json.cpp

@@ -92,7 +92,7 @@ const JSON &JSON::at(unsigned int index) const {
 
 int JSON::length() const {
     if( Type == Class::Array )
-        return Internal.List->size();
+        return static_cast<int>(Internal.List->size());
     else
         return -1;
 }
@@ -105,9 +105,9 @@ bool JSON::hasKey(const std::string &key) const {
 
 int JSON::size() const {
     if( Type == Class::Object )
-        return Internal.Map->size();
+        return static_cast<int>(Internal.Map->size());
     else if( Type == Class::Array )
-        return Internal.List->size();
+        return static_cast<int>(Internal.List->size());
     else
         return -1;
 }

lib/linux/x86_64/translations/catalogs.json

@@ -1,48 +0,0 @@
-[
-  {
-    "name": "qtbase",
-    "repositories": ["qtbase", "qtactiveqt", "qtimageformats"]
-  },
-  {
-    "name": "qtdeclarative",
-    "repositories": ["qtdeclarative"]
-  },
-  {
-    "name": "qtmultimedia",
-    "repositories": ["qtmultimedia"]
-  },
-  {
-    "name": "qtconnectivity",
-    "repositories": ["qtconnectivity"]
-  },
-  {
-    "name": "qtlocation",
-    "repositories": ["qtlocation"]
-  },
-  {
-    "name": "qtwebsockets",
-    "repositories": ["qtwebsockets"]
-  },
-  {
-    "name": "qtserialport",
-    "repositories": ["qtserialport"]
-  },
-  {
-    "name": "qtwebengine",
-    "repositories": ["qtwebengine"]
-  },
-  {
-    "name": "designer",
-    "modules": ["Designer"]
-  },
-  {
-    "name": "linguist"
-  },
-  {
-    "name": "assistant"
-  },
-  {
-    "name": "qt_help",
-    "modules": ["Help"]
-  }
-]