Commit 529f028e authored by Alexander Trofimov's avatar Alexander Trofimov Committed by GitHub

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

Release/v4.0
parents b329c378 66550e5a
language: cpp
\ No newline at end of file
...@@ -658,4 +658,4 @@ specific requirements. ...@@ -658,4 +658,4 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school, 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. 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 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/>.
\ No newline at end of file
...@@ -174,8 +174,8 @@ CONFIG(debug, debug|release) { ...@@ -174,8 +174,8 @@ CONFIG(debug, debug|release) {
linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
message(linuX) message(linuX)
LIBS += $$DESTINATION_BIN_PATH/icu/linux_64/libicuuc.so.55 LIBS += /usr/local/lib/libicuuc.so.55
LIBS += $$DESTINATION_BIN_PATH/icu/linux_64/libicudata.so.55 LIBS += /usr/local/lib/libicudata.so.55
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64 DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
DESTINATION_BIN_PATH = $$DESTINATION_BIN_PATH/linux DESTINATION_BIN_PATH = $$DESTINATION_BIN_PATH/linux
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment