Fix build for old OS X.

telegramdesktop · Jun 21, 2018 · 23140b3 · 23140b3
1 parent 8c901d8
commit 23140b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Telegram/SourceFiles/export/output/export_output_file.cpp b/Telegram/SourceFiles/export/output/export_output_file.cpp
@@ -102,13 +102,12 @@ QString File::PrepareRelativePath(
 
 	// Not lastIndexOf('.') so that "file.tar.xz" won't be messed up.
 	const auto position = suggested.indexOf('.');
-	const auto base = suggested.midRef(0, position);
+	const auto base = suggested.midRef(0, position).toString();
 	const auto extension = (position >= 0)
 		? suggested.midRef(position)
 		: QStringRef();
 	const auto relativePart = [&](int attempt) {
-		auto result = QString(" (%1)").arg(attempt);
-		result.prepend(base);
+		auto result = base + QString(" (%1)").arg(attempt);
 		result.append(extension);
 		return result;
 	};

diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h
@@ -39,7 +39,6 @@ For license and copyright information please follow this link:
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #define OS_MAC_OLD
-#define RANGES_CXX_THREAD_LOCAL 0
 #endif // QT_VERSION < 5.5.0
 
 #ifdef OS_MAC_STORE

diff --git a/Telegram/gyp/settings_mac.gypi b/Telegram/gyp/settings_mac.gypi
@@ -85,6 +85,9 @@
           '-w', # Suppress 'libstdc++ is deprecated' warning.
         ],
       },
+      'defines': [
+        'RANGES_CXX_THREAD_LOCAL=0',
+      ],
     }, {
       'xcode_settings': {
         'CLANG_CXX_LIBRARY': 'libc++',