Merge pull request #10 from ONLYOFFICE/release/v4.0

Release/v4.0

Merge pull request #10 from ONLYOFFICE/release/v4.0
Release/v4.0
529f028e · Alexander Trofimov · GitHub · b329c378 · 66550e5a · 529f028e
Commit 529f028e authored Jun 30, 2016 by Alexander Trofimov Committed by GitHub Jun 30, 2016
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

.travis.yml .travis.yml +1 -0

LICENSE.txt LICENSE.txt +1 -1

X2tConverter/build/Qt/X2tConverter.pro X2tConverter/build/Qt/X2tConverter.pro +2 -2

No files found.
--- a/.travis.yml
+++ b/.travis.yml
+language: cpp
\ No newline at end of file
--- a/LICENSE.txt
+++ b/LICENSE.txt
--- a/X2tConverter/build/Qt/X2tConverter.pro
+++ b/X2tConverter/build/Qt/X2tConverter.pro
@@ -174,8 +174,8 @@ CONFIG(debug, debug|release) {
 linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
    message(linuX)
    
-    LIBS += $$DESTINATION_BIN_PATH/icu/linux_64/libicuuc.so.55
-    LIBS += $$DESTINATION_BIN_PATH/icu/linux_64/libicudata.so.55
+    LIBS += /usr/local/lib/libicuuc.so.55
+    LIBS += /usr/local/lib/libicudata.so.55
    
    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
 	DESTINATION_BIN_PATH = $$DESTINATION_BIN_PATH/linux