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

CMakeLists.txt

@@ -111,11 +111,11 @@ endif()
 string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC)
 
 if (SYNERGY_VERSION_STAGE STREQUAL "git")
-    set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_BUILD_DATE}.${SYNERGY_REVISION}")
-    set (SYNERGY_VERSION_TAG "b${SYNERGY_BUILD_DATE}-${SYNERGY_REVISION}")
+    set (SYNERGY_SNAPSHOT_INFO ".unstable.${SYNERGY_REVISION}")
+    set (SYNERGY_VERSION_TAG "unstable.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
 else()
-    set (SYNERGY_SNAPSHOT_INFO "")
-    set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}")
+    set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}")
+    set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
 endif()
 
 set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}")
@@ -450,7 +450,7 @@ endif()
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     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") 
         install(FILES res/synergy2.desktop DESTINATION share/applications)
     else()

dist/rpm/synergy.spec.in

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

res/synergy.desktop

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

res/synergy2.desktop

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

src/gui/src/MainWindow.cpp

@@ -830,7 +830,9 @@ void MainWindow::stopSynergy()
 
     // HACK: deleting the object deletes the physical file, which is
     // 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;
 
     // reset so that new connects cause auto-hide.

src/test/guitests/guitests.pro

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

src/test/guitests/src/VersionCheckerTests.cpp

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

src/test/guitests/src/VersionCheckerTests.h

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