rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.9' into v1.9-bidir

This commit is contained in:
Andrew Nelless 2017-05-23 15:25:42 +01:00
parent 3e5cb09e19 43948f7871
commit 9bb4f564e5
8 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -111,11 +111,11 @@ endif()
string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC)
if (SYNERGY_VERSION_STAGE STREQUAL "git") if (SYNERGY_VERSION_STAGE STREQUAL "git")
set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_BUILD_DATE}.${SYNERGY_REVISION}") set (SYNERGY_SNAPSHOT_INFO ".unstable.${SYNERGY_REVISION}")
set (SYNERGY_VERSION_TAG "b${SYNERGY_BUILD_DATE}-${SYNERGY_REVISION}") set (SYNERGY_VERSION_TAG "unstable.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
else() else()
set (SYNERGY_SNAPSHOT_INFO "") set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}")
set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}") set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
endif() endif()
set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}")
@ -450,7 +450,7 @@ endif()
# #
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm) configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
install(FILES res/synergy.svg DESTINATION share/icons) install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps)
if("${VERSION_MAJOR}" STREQUAL "2") if("${VERSION_MAJOR}" STREQUAL "2")
install(FILES res/synergy2.desktop DESTINATION share/applications) install(FILES res/synergy2.desktop DESTINATION share/applications)
else() else()

2
dist/rpm/synergy.spec.in vendored
View File

@ -20,7 +20,7 @@ Work seamlessly across Windows, macOS and Linux.
%{_bindir}/synergys %{_bindir}/synergys
%{_bindir}/syntool %{_bindir}/syntool
%attr(644,-,-) %{_datarootdir}/applications/synergy.desktop %attr(644,-,-) %{_datarootdir}/applications/synergy.desktop
%attr(644,-,-) %{_datarootdir}/icons/synergy.svg %attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/synergy.svg
%changelog %changelog
* Wed Apr 26 2017 Symless <engineering@symless.com> * Wed Apr 26 2017 Symless <engineering@symless.com>

5
res/synergy.desktop
View File

@ -5,7 +5,8 @@ Name=Synergy
Comment=Keyboard and mouse sharing solution Comment=Keyboard and mouse sharing solution
Path=/usr/bin Path=/usr/bin
Exec=/usr/bin/synergy Exec=/usr/bin/synergy
Icon=/usr/share/icons/synergy.svg Icon=synergy
Terminal=false Terminal=false
Categories=Network; Categories=Utility;
Keywords=keyboard;mouse;sharing;network;share;

6
res/synergy2.desktop
View File

@ -5,7 +5,7 @@ Name=Synergy
Comment=Keyboard and mouse sharing solution Comment=Keyboard and mouse sharing solution
Path=/usr/bin Path=/usr/bin
Exec=/usr/bin/synergy2 Exec=/usr/bin/synergy2
Icon=/usr/share/icons/synergy.svg Icon=synergy
Terminal=false Terminal=false
Categories=Network; Categories=Utility;
Keywords=keyboard;mouse;sharing;network;share;

4
src/gui/src/MainWindow.cpp
View File

@ -830,7 +830,9 @@ void MainWindow::stopSynergy()
// HACK: deleting the object deletes the physical file, which is // HACK: deleting the object deletes the physical file, which is
// bad, since it could be in use by the Windows service! // bad, since it could be in use by the Windows service!
//delete m_pTempConfigFile; #if !defined(Q_OS_WIN)
delete m_pTempConfigFile;
#endif
m_pTempConfigFile = NULL; m_pTempConfigFile = NULL;
// reset so that new connects cause auto-hide. // reset so that new connects cause auto-hide.

3
src/test/guitests/guitests.pro
View File

@ -8,8 +8,7 @@ TEMPLATE = app
INCLUDEPATH += ../../gui/src INCLUDEPATH += ../../gui/src
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/VersionCheckerTests.cpp src/VersionCheckerTests.cpp
HEADERS += src/VersionCheckerTests.h \ HEADERS += src/VersionCheckerTests.h
src/VersionChecker.h
win32 { win32 {
Debug:DESTDIR = ../../../bin/Debug Debug:DESTDIR = ../../../bin/Debug
Release:DESTDIR = ../../../bin/Release Release:DESTDIR = ../../../bin/Release

2
src/test/guitests/src/VersionCheckerTests.cpp
View File

@ -18,7 +18,7 @@
#include "VersionCheckerTests.h" #include "VersionCheckerTests.h"
#include "VersionChecker.cpp" #include "VersionChecker.cpp"
#include "../../gui/tmp/debug/moc_VersionChecker.cpp" #include "../../gui/tmp/release/moc_VersionChecker.cpp"
#include <QtTest/QTest> #include <QtTest/QTest>

2
src/test/guitests/src/VersionCheckerTests.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "QObject.h" #include "qobject.h"
class VersionCheckerTests : public QObject class VersionCheckerTests : public QObject
{ {