From a058b6e3a6a99e3815d2cbfecce96b32307bb90d Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 15 Jun 2016 09:59:43 +0300 Subject: [PATCH] Forced update of Telegram.plist in build script. Use c++14 flag in .pro. --- Telegram/MetaLang.pro | 2 +- Telegram/Telegram.pro | 2 +- Telegram/build/build.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Telegram/MetaLang.pro b/Telegram/MetaLang.pro index cb60900f8..c244acbfc 100644 --- a/Telegram/MetaLang.pro +++ b/Telegram/MetaLang.pro @@ -12,7 +12,7 @@ CONFIG(release, debug|release) { DESTDIR = ./../ReleaseLang } -CONFIG += plugin static c++11 +CONFIG += plugin static c++14 macx { QMAKE_INFO_PLIST = ./SourceFiles/_other/Lang.plist diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro index cc3956cc3..b2824c378 100644 --- a/Telegram/Telegram.pro +++ b/Telegram/Telegram.pro @@ -1,6 +1,6 @@ QT += core gui network widgets -CONFIG += plugin static c++11 +CONFIG += plugin static c++14 CONFIG(debug, debug|release) { DEFINES += _DEBUG diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh index 551412216..4cb1ea918 100755 --- a/Telegram/build/build.sh +++ b/Telegram/build/build.sh @@ -215,6 +215,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg if [ "$FastParam" != "fast" ]; then touch "./Resources/telegram.qrc" + touch "./Telegram.plist" fi xcodebuild -project Telegram.xcodeproj -alltargets -configuration Release build