diff options
| author | Markus Goetz <markus@woboq.com> | 2017-12-15 13:56:27 +0300 |
|---|---|---|
| committer | Markus Goetz <markus@woboq.com> | 2017-12-15 13:56:27 +0300 |
| commit | 61939d67e6c3f2487f83cee9ac9d53454d136359 (patch) | |
| tree | c09f3d15e478e30896aad88f73f87de7421c1fc6 | |
| parent | 47d282fafe7830cdf5b28febdb019ac3361c5b96 (diff) | |
| parent | 298f1ab57000afd7acb8c0ddbddca8a1fc6cd92a (diff) | |
Merge branch '2.4' into 2.4.0-rc2v2.4.0-rc2
| -rw-r--r-- | mirall.desktop.in | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mirall.desktop.in b/mirall.desktop.in index a57124e37..597ac8a90 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -81,6 +81,9 @@ X-GNOME-Autostart-Delay=3 # Translations + + +# Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion Name[oc]=@APPLICATION_NAME@ sincronizacion del client diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 172422988..70c66acc4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ if(NOT TOKEN_AUTH_ONLY) find_package(Qt5Keychain REQUIRED) endif() -if(NOT MSVC) +if(NOT WIN32) if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")) if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector --param=ssp-buffer-size=4") |