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

Release/v4.0
This commit is contained in:
Alexander Trofimov
2016-06-30 12:46:21 +03:00
committed by GitHub
3 changed files with 4 additions and 3 deletions

1
.travis.yml Normal file
View File

@ -0,0 +1 @@
language: cpp

View File

@ -658,4 +658,4 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
<http://www.gnu.org/licenses/>.

View File

@ -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