Merge pull request #6810 from symless/intergration-6809

Intergration 6809

ChangeLog

@@ -8,6 +8,7 @@ Bug fixes:
 - #6760 Synergy loses license when creating a System scope config
 - #6342 Updated copyright year in version to use build date
 - #6771 Added Ubuntu 16 to CI/CD
+- #6660 + #6582 Add missing XAtom for utf-8 handling with Xorg
 
 
 Enhancements:

azure-pipelines.yml

@@ -7,6 +7,9 @@ jobs:
     pool:
       vmImage: 'ubuntu-16.04'
 
+    #As apparently the trigger set to none doesn't work
+    condition: eq(variables['Build.Reason'], 'Manual')
+
     strategy:
       matrix:
         ubuntu1604:
@@ -90,6 +93,9 @@ jobs:
     pool:
       vmImage: $[ variables['image'] ]
 
+    #As apparently the trigger set to none doesn't work
+    condition: eq(variables['Build.Reason'], 'Manual')
+
     variables:
       QT_PATH: '/usr/local/opt/qt/bin'
 
@@ -112,6 +118,9 @@ jobs:
     pool:
       vmImage: $[ variables['image'] ]
 
+    #As apparently the trigger set to none doesn't work
+    condition: eq(variables['Build.Reason'], 'Manual')
+
     variables:
       QT_VERSION: '5.12.6'
       QLI_OUT_DIR: '.\deps\Qt'

src/lib/platform/XWindowsClipboard.cpp

@@ -82,6 +82,8 @@ XWindowsClipboard::XWindowsClipboard(Display* display,
     m_converters.push_back(new XWindowsClipboardBMPConverter(m_display));
     m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display,
                                 "text/plain;charset=UTF-8"));
+    m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display,
+                                "text/plain;charset=utf-8"));
     m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display,
                                 "UTF8_STRING"));
     m_converters.push_back(new XWindowsClipboardUCS2Converter(m_display,