net-im/telegram-desktop: update to 2.1.7

Accumulated Changelog:

- Fix the Fcitx input method plugin.
- Bug fixes and other minor improvements.
- Disable the taskbar icon flash or the dock icon bounce in Settings >
  Notifications.
- View messages containing long monospace texts in wide bubbles.
- Bug fixes and other minor improvements.
- Improve bold font selection.
- Added support for new emoji.
- Channels to which you can't post will no longer be suggested when
  forwarding.
- Improved font selection and bold font support for CJK and Farsi.
- Fix polls and quizes results viewing.
- Fix memory leak in web page previews with autoplayed videos.
- Fix running on OS X 10.10.
- Other minor bug fixes and improvements.
- Improve quiz explanation tooltip layout.
- Fix possible crash in theme editor.
- Other minor bug fixes and improvements.

PR:	246709
Submitted by:	henry.hu.sh@gmail.com (maintainer)

18 files changed, 48 insertions, 89 deletions

diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 27a052db0495..3c63d5d77ad1 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	telegram-desktop
-DISTVERSION=	2.1.0
+DISTVERSION=	2.1.7
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTNAME=	tdesktop-${DISTVERSION}-full
diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo
index bc933f3ac89d..4ae7754e489b 100644
--- a/net-im/telegram-desktop/distinfo
+++ b/net-im/telegram-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587747983
-SHA256 (tdesktop-2.1.0-full.tar.gz) = 86d2acc2dfd426ea222ae94984d81e60774f16f3ecc3405578377d90f809a950
-SIZE (tdesktop-2.1.0-full.tar.gz) = 26133964
+TIMESTAMP = 1590358574
+SHA256 (tdesktop-2.1.7-full.tar.gz) = c944b07f1a7d600a32cea9e4ce45b4954fe0d18176a7491c2f1e98f3425cca62
+SIZE (tdesktop-2.1.7-full.tar.gz) = 36509059
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp
index 593f3cbe3833..3b9bb75f6692 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/core/launcher.cpp.orig	2020-02-18 08:28:06 UTC
+--- Telegram/SourceFiles/core/launcher.cpp.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/SourceFiles/core/launcher.cpp
-@@ -248,7 +248,7 @@ void Launcher::init() {
+@@ -275,7 +275,7 @@ void Launcher::init() {
  
  	QApplication::setApplicationName(qsl("TelegramDesktop"));
  
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
index 63917b048485..88ffcfbff5bd 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig	2020-02-18 08:28:06 UTC
+--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
-@@ -1451,13 +1451,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
+@@ -1458,13 +1458,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
  	_mouseSelectType = TextSelectType::Letters;
  	//_widget->noSelectingScroll(); // TODO
  
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp
index 8f1a34092277..50a8ace6d423 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig	2020-03-16 18:49:16 UTC
+--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/SourceFiles/history/history_inner_widget.cpp
-@@ -1420,7 +1420,7 @@ void HistoryInner::mouseActionFinish(
+@@ -1421,7 +1421,7 @@ void HistoryInner::mouseActionFinish(
  	_widget->noSelectingScroll();
  	_widget->updateTopBarSelection();
  
@@ -9,7 +9,7 @@
  	if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {
  		const auto [item, selection] = *_selected.cbegin();
  		if (const auto view = item->mainView()) {
-@@ -1429,7 +1429,7 @@ void HistoryInner::mouseActionFinish(
+@@ -1430,7 +1430,7 @@ void HistoryInner::mouseActionFinish(
  				QClipboard::Selection);
  		}
  	}
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp
index 9c104c795735..19667a598c29 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig	2020-02-18 08:28:06 UTC
+--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp
-@@ -2066,7 +2066,7 @@ void ListWidget::mouseActionFinish(
+@@ -2072,7 +2072,7 @@ void ListWidget::mouseActionFinish(
  	_mouseSelectType = TextSelectType::Letters;
  	//_widget->noSelectingScroll(); // #TODO select scroll
  
@@ -9,7 +9,7 @@
  	if (_selectedTextItem
  		&& _selectedTextRange.from != _selectedTextRange.to) {
  		if (const auto view = viewForItem(_selectedTextItem)) {
-@@ -2075,7 +2075,7 @@ void ListWidget::mouseActionFinish(
+@@ -2081,7 +2081,7 @@ void ListWidget::mouseActionFinish(
  				QClipboard::Selection);
  }
  	}
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp
index e06300824eb8..0553286079fd 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/logs.cpp.orig	2020-02-18 08:28:06 UTC
+--- Telegram/SourceFiles/logs.cpp.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/SourceFiles/logs.cpp
-@@ -342,7 +342,7 @@ void start(not_null<Core::Launcher*> launcher) {
+@@ -343,7 +343,7 @@ void start(not_null<Core::Launcher*> launcher) {
  		workingDirChosen = true;
  	} else {
  
@@ -9,7 +9,7 @@
  
  		if (!cWorkingDir().isEmpty()) {
  			// This value must come from TelegramForcePortable
-@@ -357,16 +357,16 @@ void start(not_null<Core::Launcher*> launcher) {
+@@ -358,16 +358,16 @@ void start(not_null<Core::Launcher*> launcher) {
  		}
  		workingDirChosen = true;
  
@@ -30,7 +30,7 @@
  
  #ifdef _DEBUG
  		cForceWorkingDir(cExeDir());
-@@ -383,7 +383,7 @@ void start(not_null<Core::Launcher*> launcher) {
+@@ -385,7 +385,7 @@ void start(not_null<Core::Launcher*> launcher) {
  			workingDirChosen = true;
  		}
  
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h
index ee5f112c4919..3559e476a3f2 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/platform/platform_file_utilities.h.orig	2018-08-04 18:53:40 UTC
+--- Telegram/SourceFiles/platform/platform_file_utilities.h.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/SourceFiles/platform/platform_file_utilities.h
-@@ -45,8 +45,8 @@ bool Get(
+@@ -46,8 +46,8 @@ bool Get(
  
  #ifdef Q_OS_MAC
  #include "platform/mac/file_utilities_mac.h"
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h
index 510d4105046f..952a5fc1e2cc 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig	2018-08-04 18:53:40 UTC
+--- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/SourceFiles/platform/platform_notifications_manager.h
-@@ -26,8 +26,8 @@ void FlashBounce();
+@@ -27,8 +27,8 @@ namespace Notifications {
  
  #ifdef Q_OS_MAC
  #include "platform/mac/notifications_manager_mac.h"
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp
index ba930533952f..9cc7648f4e69 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/qt_static_plugins.cpp.orig	2020-03-16 18:49:16 UTC
+--- Telegram/SourceFiles/qt_static_plugins.cpp.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/SourceFiles/qt_static_plugins.cpp
-@@ -19,7 +19,7 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+@@ -20,7 +20,7 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
  #elif defined Q_OS_MAC // Q_OS_WIN
  Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
  Q_IMPORT_PLUGIN(QGenericEnginePlugin)
@@ -9,9 +9,16 @@
  Q_IMPORT_PLUGIN(ShmServerBufferPlugin)
  Q_IMPORT_PLUGIN(DmaBufServerBufferPlugin)
  Q_IMPORT_PLUGIN(DrmEglServerBufferPlugin)
-@@ -45,4 +45,4 @@ Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
- Q_IMPORT_PLUGIN(NimfInputContextPlugin)
+@@ -44,10 +44,10 @@ Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin)
+ Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
  Q_IMPORT_PLUGIN(QXdgDesktopPortalThemePlugin)
  #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
 -#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
 +#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX | Q_OS_FREEBSD
+ #endif // !DESKTOP_APP_USE_PACKAGED
+ 
+-#ifdef Q_OS_LINUX
++#if defined Q_OS_LINUX || defined Q_OS_FREEBSD
+ #if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
+ Q_IMPORT_PLUGIN(QWaylandMaterialDecorationPlugin)
+ Q_IMPORT_PLUGIN(NimfInputContextPlugin)
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp
index f6f78becf90a..d837c8800104 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/window/main_window.cpp.orig	2020-02-18 08:28:06 UTC
+--- Telegram/SourceFiles/window/main_window.cpp.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/SourceFiles/window/main_window.cpp
-@@ -589,7 +589,7 @@ bool MainWindow::minimizeToTray() {
+@@ -603,7 +603,7 @@ bool MainWindow::minimizeToTray() {
  }
  
  void MainWindow::reActivateWindow() {
@@ -9,7 +9,7 @@
  	const auto reActivate = [=] {
  		if (const auto w = App::wnd()) {
  			if (auto f = QApplication::focusWidget()) {
-@@ -604,7 +604,7 @@ void MainWindow::reActivateWindow() {
+@@ -618,7 +618,7 @@ void MainWindow::reActivateWindow() {
  	};
  	crl::on_main(this, reActivate);
  	base::call_delayed(200, this, reActivate);
diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h
deleted file mode 100644
index c8c333dcca55..000000000000
--- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_rlottie_src_lottie_rapidjson_document.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- Telegram/ThirdParty/rlottie/src/lottie/rapidjson/document.h.orig	2020-01-23 12:47:53 UTC
-+++ Telegram/ThirdParty/rlottie/src/lottie/rapidjson/document.h
-@@ -24,6 +24,9 @@
- #include "encodedstream.h"
- #include <new>      // placement new
- #include <limits>
-+#ifdef __cpp_impl_three_way_comparison
-+#include <compare>
-+#endif
- 
- RAPIDJSON_DIAG_PUSH
- #ifdef __clang__
-@@ -175,12 +178,17 @@ class GenericMemberIterator { (public)
- 
-     //! @name relations
-     //@{
-+#ifdef __cpp_impl_three_way_comparison
-+    template <bool Const_> bool operator==(const GenericMemberIterator<Const_,Encoding,Allocator>& that) const { return ptr_ == that.ptr_; }
-+    template <bool Const_> std::strong_ordering operator<=>(const GenericMemberIterator<Const_,Encoding,Allocator>& that) const { return ptr_ <=> that.ptr_; }
-+#else
-     bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; }
-     bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; }
-     bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; }
-     bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; }
-     bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; }
-     bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; }
-+#endif
-     //@}
- 
-     //! @name dereference
diff --git a/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake b/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake
index 73768e26a9dc..ac1f8f0fce42 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake
+++ b/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake
@@ -1,6 +1,6 @@
---- Telegram/cmake/lib_tgvoip.cmake.orig	2020-04-30 01:34:51 UTC
+--- Telegram/cmake/lib_tgvoip.cmake.orig	2020-05-24 07:59:19 UTC
 +++ Telegram/cmake/lib_tgvoip.cmake
-@@ -778,11 +778,17 @@ else()
+@@ -793,11 +793,17 @@ else()
          )
      endif()
  
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_bytes.h b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_bytes.h
index 869b4eb37ad3..e72f800947a4 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_bytes.h
+++ b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_bytes.h
@@ -1,6 +1,6 @@
---- Telegram/lib_base/base/bytes.h.orig	2020-01-29 09:41:30 UTC
+--- Telegram/lib_base/base/bytes.h.orig	2020-05-12 13:19:31 UTC
 +++ Telegram/lib_base/base/bytes.h
-@@ -136,7 +136,7 @@ template <
+@@ -145,7 +145,7 @@ template <
  vector concatenate(Args &&...args) {
  	const auto size = details::spansLength(args...);
  	auto result = vector(size);
@@ -9,7 +9,7 @@
  	return result;
  }
  
-@@ -148,7 +148,7 @@ vector concatenate(SpanRange args) {
+@@ -157,7 +157,7 @@ vector concatenate(SpanRange args) {
  		size += bytes::make_span(arg).size();
  	}
  	auto result = vector(size);
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h
index e1715e737b68..2528c507709a 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h
+++ b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h
@@ -1,6 +1,6 @@
---- Telegram/lib_base/base/platform/base_platform_file_utilities.h.orig	2020-01-29 09:41:30 UTC
+--- Telegram/lib_base/base/platform/base_platform_file_utilities.h.orig	2020-05-12 13:19:31 UTC
 +++ Telegram/lib_base/base/platform/base_platform_file_utilities.h
-@@ -22,8 +22,8 @@ void RemoveQuarantine(const QString &path);
+@@ -26,8 +26,8 @@ void FlushFileData(QFile &file);
  
  #ifdef Q_OS_MAC
  #include "base/platform/mac/base_file_utilities_mac.h"
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_thread__safe__wrap.h b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_thread__safe__wrap.h
deleted file mode 100644
index 8e0764f500a8..000000000000
--- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_thread__safe__wrap.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- Telegram/lib_base/base/thread_safe_wrap.h.orig	2020-01-29 09:41:30 UTC
-+++ Telegram/lib_base/base/thread_safe_wrap.h
-@@ -19,13 +19,13 @@ class thread_safe_wrap { (public)
- 
- 	template <typename Callback>
- 	auto with(Callback &&callback) {
--		QMutexLocker lock(&_mutex);
-+		QMutexLocker lock((QBasicMutex *)&_mutex);
- 		return callback(_value);
- 	}
- 
- 	template <typename Callback>
- 	auto with(Callback &&callback) const {
--		QMutexLocker lock(&_mutex);
-+		QMutexLocker lock((QBasicMutex *)&_mutex);
- 		return callback(_value);
- 	}
- 
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_zlib__help.h b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_zlib__help.h
index 9ea639d805f4..bea32ef42fa7 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_zlib__help.h
+++ b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_zlib__help.h
@@ -1,11 +1,11 @@
---- Telegram/lib_base/base/zlib_help.h.orig	2020-01-29 09:41:30 UTC
+--- Telegram/lib_base/base/zlib_help.h.orig	2020-05-12 13:19:31 UTC
 +++ Telegram/lib_base/base/zlib_help.h
 @@ -6,8 +6,8 @@
  //
  #pragma once
  
--#include "zip.h"
--#include "unzip.h"
+-#include <zip.h>
+-#include <unzip.h>
 +#include "minizip/zip.h"
 +#include "minizip/unzip.h"
  #include "logs.h"
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp
index ed63cd4530b6..48cc1e4bf0d7 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp
@@ -1,6 +1,6 @@
---- Telegram/lib_ui/ui/style/style_core_font.cpp.orig	2020-02-10 08:12:05 UTC
+--- Telegram/lib_ui/ui/style/style_core_font.cpp.orig	2020-05-24 07:44:41 UTC
 +++ Telegram/lib_ui/ui/style/style_core_font.cpp
-@@ -22,7 +22,7 @@ void style_InitFontsResource() {
+@@ -24,7 +24,7 @@ void style_InitFontsResource() {
  	Q_INIT_RESOURCE(win);
  #elif defined Q_OS_MAC // Q_OS_WIN
  	Q_INIT_RESOURCE(mac);