Port latest changes from 0.8.0 to 0.9 branch (RedisInsight#3693)

Port changes from 0.8.0 and update submodules
WackYHooz · Sep 2, 2016 · 7134d00 · 7134d00
1 parent 30b4669
commit 7134d00
Show file tree

Hide file tree

Showing 119 changed files with 3,968 additions and 1,506 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "3rdparty/qgamp"]
 	path = 3rdparty/qgamp
 	url = https://github.com/uglide/qgamp.git
-[submodule "src/modules/code-editor/ace"]
-	path = src/modules/code-editor/ace
-	url = https://github.com/ajaxorg/ace-builds.git
 [submodule "src/qml/3rdparty/php-unserialize-js"]
 	path = src/qml/3rdparty/php-unserialize-js
 	url = https://github.com/uglide/php-unserialize-js.git
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,23 @@
 language: cpp
 dist: trusty
+sudo: required
+
 os:
   - linux
   - osx
-before_install:
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update > /dev/null; brew install qt5 > /dev/null; export PATH=/usr/local/opt/qt5/bin/:$PATH; fi
+
+install:
+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then 
+       brew update > /dev/null
+    && brew install qt5 > /dev/null
+    && export PATH=/usr/local/opt/qt5/bin/:$PATH
+    ;
+  fi
 - cd ./src && ./configure && cd ./../
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then source /opt/qt54/bin/qt54-env.sh; fi
+- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+       source /opt/qt56/bin/qt56-env.sh
+       ; 
+  fi
 - qmake -v
 script:
   - git submodule update --init --recursive 

diff --git a/3rdparty/3rdparty.pri b/3rdparty/3rdparty.pri
@@ -32,14 +32,14 @@ win32-msvc* {
     QMAKE_CFLAGS_RELEASE += /Zi
     QMAKE_LFLAGS_RELEASE += /debug /opt:ref
 } else {
-QMAKE_CXXFLAGS+=-g
-QMAKE_CFLAGS_RELEASE+=-g
+    QMAKE_CXXFLAGS+=-g
+    QMAKE_CFLAGS_RELEASE+=-g
 }
 
 win32* {    
     win32-g++ {
-    # Workaround for mingw
-    QMAKE_LFLAGS_RELEASE=
+        # Workaround for mingw
+        QMAKE_LFLAGS_RELEASE=
     } else {
         INCLUDEPATH += $$PWD/qredisclient/3rdparty/windows/rmt_zlib.1.2.8.5/build/native/include
     }

diff --git a/3rdparty/crashreporter b/3rdparty/crashreporter
diff --git a/3rdparty/qredisclient b/3rdparty/qredisclient
+4 −4		.travis.yml
+339 −0		LICENSE
+2 −0		README.md
+4 −4		crashreporter.pro
+11 −0		.gitignore
+17 −11		.travis.yml
+24 −6		3rdparty/3rdparty.pri
+17 −1		3rdparty/qsshclient/qxtsshchannel.cpp
+41 −23		3rdparty/qsshclient/qxtsshclient.cpp
+5 −1		3rdparty/qsshclient/qxtsshclient_p.h
+2 −1		README.md
+2 −0		qredisclient.pro
+122 −36		src/qredisclient/connection.cpp
+49 −2		src/qredisclient/connection.h
+7 −1		src/qredisclient/connectionconfig.cpp
+1 −0		src/qredisclient/connectionconfig.h
+71 −29		src/qredisclient/response.cpp
+1 −1		src/qredisclient/response.h
+129 −49		src/qredisclient/transporters/abstracttransporter.cpp
+12 −7		src/qredisclient/transporters/abstracttransporter.h
+40 −13		src/qredisclient/transporters/defaulttransporter.cpp
+34 −17		src/qredisclient/transporters/sshtransporter.cpp
+4 −1		src/qredisclient/transporters/sshtransporter.h
+11 −3		src/qredisclient/utils/sync.cpp
+3 −1		src/qredisclient/utils/sync.h
+134 −0		tests/functional/main.cpp
+15 −0		tests/functional/qredis-runner.pro
+2 −0		tests/functional/requirements.txt
+50 −0		tests/functional/tests.py
+1 −1		tests/unit_tests/basetestcase.h
+13 −6		tests/unit_tests/main.cpp
+8 −1		tests/unit_tests/mocks/dummyTransporter.h
+20 −3		tests/unit_tests/mocks/dummyconnection.h
+45 −0		tests/unit_tests/run_tests
+4 −3		tests/unit_tests/test_connection.cpp
+1 −1		tests/unit_tests/test_connection.h
+1 −1		tests/unit_tests/test_response.cpp
+14 −0		tests/unit_tests/tests.supp
+5 −0		tests/unit_tests/unit_tests.pro