From 69b78102972c6ab2dc22586a6b2728dad1198b00 Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Tue, 28 May 2019 12:07:14 +0300
Subject: [PATCH] [win-nix] fixes for qt 5.6

---
 win-linux/defaults.pri                          | 15 +++++++--------
 win-linux/src/cascapplicationmanagerwrapper.cpp |  1 +
 win-linux/src/cmainpanel.cpp                    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/win-linux/defaults.pri b/win-linux/defaults.pri
index 60e9ff187..c0bceba55 100644
--- a/win-linux/defaults.pri
+++ b/win-linux/defaults.pri
@@ -103,6 +103,13 @@ SOURCES += \
 
 RESOURCES += $$PWD/resources.qrc
 
+isEqual(QT_MAJOR_VERSION, 5) {
+    lessThan(QT_MINOR_VERSION, 10) {
+        DEFINES += _QTVER_DOWNGRADE
+        message("QTVER_DOWNGRADE")
+    }
+}
+
 linux-g++ {
     CONFIG += app_linux
 	linux-g++:contains(QMAKE_HOST.arch, x86_64): {
@@ -158,14 +165,6 @@ app_linux {
     LIBS += $$PWD/$$CORE_3DPARTY_PATH/icu/$$PLATFORM_BUILD/build/libicudata.so.58
 
     DEFINES += DOCUMENTSCORE_OPENSSL_SUPPORT
-
-isEqual(QT_MAJOR_VERSION, 5) {
-    lessThan(QT_MINOR_VERSION, 10) {
-        DEFINES += _QTVER_DOWNGRADE
-        message("QTVER_DOWNGRADE")
-    }
-}
-
 }
 
 
diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp
index 325fbc9ac..ab325c2e1 100644
--- a/win-linux/src/cascapplicationmanagerwrapper.cpp
+++ b/win-linux/src/cascapplicationmanagerwrapper.cpp
@@ -11,6 +11,7 @@
 #include <QJsonObject>
 #include <QProcess>
 #include <algorithm>
+#include <functional>
 
 #include "cstyletweaks.h"
 #include "defines.h"
diff --git a/win-linux/src/cmainpanel.cpp b/win-linux/src/cmainpanel.cpp
index 947b7e1b0..b400abe3f 100644
--- a/win-linux/src/cmainpanel.cpp
+++ b/win-linux/src/cmainpanel.cpp
@@ -621,7 +621,7 @@ void CMainPanel::onPortalLogin(int vid, QString info)
 
 void CMainPanel::onCloudDocumentOpen(std::wstring url, int id, bool select)
 {
-    qDebug() << "on document open: " << url;
+//    qDebug() << "on document open: " << url;
     COpenOptions opts = {url};
     opts.id = id;