mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Closed beta 10002002: testin OS X build by GYP.

Browse Source
This commit is contained in:
John Preston
2016-09-02 01:27:54 -04:00
parent 58f0dbe2a4
commit 07dffb948d
11 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/_other/packer.cpp
View File

@@ -138,18 +138,6 @@ QString BetaSignature;
int main(int argc, char *argv[])
{
QString workDir;
#ifdef Q_OS_MAC
if (QDir(QString()).absolutePath() == "/") {
QString first = argc ? QString::fromLocal8Bit(argv[0]) : QString();
if (!first.isEmpty()) {
QFileInfo info(first);
if (info.exists()) {
QDir result(info.absolutePath() + "/../../..");
workDir = result.absolutePath() + '/';
}
}
}
#endif
QString remove;
int version = 0;

8
Telegram/SourceFiles/_other/updater_osx.m
View File

@@ -160,6 +160,14 @@ int main(int argc, const char * argv[]) {
writeLog([@"Starting update files iteration, path: " stringByAppendingString: srcEnum]);
NSString *contentsPath = [appDirFull stringByAppendingString: @"/Contents"];
writeLog([[NSArray arrayWithObjects: @"Clearing dir ", contentsPath, nil] componentsJoinedByString:@""]);
if (![fileManager removeItemAtPath:contentsPath error:nil]) {
writeLog([@"Failed to clear path for directory " stringByAppendingString:contentsPath]);
delFolder();
return -1;
}
NSArray *keys = [NSArray arrayWithObject:NSURLIsDirectoryKey];
NSDirectoryEnumerator *enumerator = [fileManager
enumeratorAtURL:[NSURL fileURLWithPath:srcEnum]

3
Telegram/SourceFiles/codegen/style/structure_types.h
View File

@@ -24,6 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include <vector>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QtMath>
namespace codegen {
namespace style {
@@ -78,7 +79,7 @@ inline int pxAdjust(int value, int scale) {
if (value < 0) {
return -pxAdjust(-value, scale);
}
return static_cast<int>(std::floor((value * scale / 4.) + 0.1));
return qFloor((value * scale / 4.) + 0.1);
}
struct point {

2
Telegram/SourceFiles/core/version.h
View File

@@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "core/basic_types.h"
#define BETA_VERSION_MACRO (10002001ULL)
#define BETA_VERSION_MACRO (10002002ULL)
constexpr int AppVersion = 10002;
constexpr str_const AppVersionStr = "0.10.2";