Created
August 11, 2016 21:35
-
-
Save dionorgua/ab7fd2e781e4fc1b153054e650405104 to your computer and use it in GitHub Desktop.
QSyncThing debian
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/CMakeLists.txt b/CMakeLists.txt | |
| index 83346a8..1e53fae 100644 | |
| --- a/CMakeLists.txt | |
| +++ b/CMakeLists.txt | |
| @@ -2,25 +2,25 @@ cmake_minimum_required(VERSION 3.2) | |
| project (QSyncthingTray) | |
| -if ("$ENV{QTDIR}" STREQUAL "") | |
| - MESSAGE(FATAL_ERROR "QTDIR not specified. Please export QTDIR | |
| - e.g. export QTDIR = ~/Qt/5.5/gcc_64/") | |
| -endif ("$ENV{QTDIR}" STREQUAL "") | |
| - | |
| -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") | |
| - if (${CMAKE_CL_64} MATCHES 0) | |
| - message (STATUS "MSVC 64 Bit: ${CMAKE_CL_64}") | |
| - set(CMAKE_PREFIX_PATH "$ENV{QTDIR}") | |
| - else(${CMAKE_CL_64} MATCHES 0) | |
| - set(CMAKE_PREFIX_PATH "$ENV{QTDIR}") | |
| - endif(${CMAKE_CL_64} MATCHES 0) | |
| -endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") | |
| -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | |
| - set(CMAKE_PREFIX_PATH "$ENV{QTDIR}") | |
| -endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | |
| -if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") | |
| - set(CMAKE_PREFIX_PATH "$ENV{QTDIR}") | |
| -endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") | |
| +#if ("$ENV{QTDIR}" STREQUAL "") | |
| +# MESSAGE(FATAL_ERROR "QTDIR not specified. Please export QTDIR | |
| +# e.g. export QTDIR = ~/Qt/5.5/gcc_64/") | |
| +#endif ("$ENV{QTDIR}" STREQUAL "") | |
| +# | |
| +#if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") | |
| +# if (${CMAKE_CL_64} MATCHES 0) | |
| +# message (STATUS "MSVC 64 Bit: ${CMAKE_CL_64}") | |
| +# set(CMAKE_PREFIX_PATH "$ENV{QTDIR}") | |
| +# else(${CMAKE_CL_64} MATCHES 0) | |
| +# set(CMAKE_PREFIX_PATH "$ENV{QTDIR}") | |
| +# endif(${CMAKE_CL_64} MATCHES 0) | |
| +#endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") | |
| +#if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | |
| +# set(CMAKE_PREFIX_PATH "$ENV{QTDIR}") | |
| +#endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | |
| +#if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") | |
| +# set(CMAKE_PREFIX_PATH "$ENV{QTDIR}") | |
| +#endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") | |
| @@ -34,7 +34,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") | |
| # Find the QtWidgets library | |
| find_package(Qt5Widgets REQUIRED) | |
| find_package(Qt5Network) | |
| -find_package(Qt5Declarative) | |
| add_definitions(-DGLEW_STATIC) | |
| # The Qt5Widgets_INCLUDES also includes the include directories for | |
| @@ -124,7 +123,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") | |
| get_target_property(QtCore_location Qt5::Core LOCATION) | |
| endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") | |
| -qt5_use_modules(QSyncthingTray Widgets Network WebEngineWidgets WebKitWidgets) | |
| +qt5_use_modules(QSyncthingTray Widgets Network WebKitWidgets) | |
| if (${QST_BUILD_WEBKIT}) | |
| qt5_use_modules(QSyncthingTray Widgets Network WebKitWidgets) | |
| if(APPLE) | |
| diff --git a/includes/platforms/linux/posixUtils.hpp b/includes/platforms/linux/posixUtils.hpp | |
| index 01658c1..2cfaa94 100644 | |
| --- a/includes/platforms/linux/posixUtils.hpp | |
| +++ b/includes/platforms/linux/posixUtils.hpp | |
| @@ -21,6 +21,7 @@ | |
| #include <sstream> | |
| #include <string> | |
| #include <iostream> | |
| +#include <memory> | |
| #include <QProcessEnvironment> | |
| #include <QString> | |
| #define UNUSED(x) (void)(x) | |
| diff --git a/includes/qst/syncwebkitview.h b/includes/qst/syncwebkitview.h | |
| index 0eeff9e..050c614 100644 | |
| --- a/includes/qst/syncwebkitview.h | |
| +++ b/includes/qst/syncwebkitview.h | |
| @@ -25,6 +25,8 @@ | |
| #include <QNetworkReply> | |
| #include <QWebView> | |
| +#include <memory> | |
| + | |
| //------------------------------------------------------------------------------------// | |
| using Authentication = std::pair<QString, QString>; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment