RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into dev_private

This commit is contained in:
John Preston 2016-07-27 21:13:49 +03:00
parent 832163c1b7 4b9b9e2e13
commit f813b8a74b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/historywidget.cpp
View File

@ -1482,10 +1482,6 @@ void HistoryInner::keyPressEvent(QKeyEvent *e) {
if (!_selected.isEmpty() && selectedForDelete == selectedForForward) {
_widget->onDeleteSelected();
}
} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
if (_selected.isEmpty()) {
_widget->onListEnterPressed();
}
} else {
e->ignore();
}
@ -7410,6 +7406,8 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
}
_scroll.keyPressEvent(e);
}
} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
onListEnterPressed();
} else {
e->ignore();
}

7
Telegram/build/makefile_static.sh
View File

@ -38,7 +38,9 @@ fi
Replace () {
CheckCommand="grep -ci '$1' Makefile"
set +e
CheckCount=$(eval $CheckCommand)
set -e
if [ "$CheckCount" -gt 0 ]; then
echo "Requested '$1' to '$2', found - replacing.."
ReplaceCommand="sed -i'.~' 's/$1/$2/g' Makefile"
@ -48,9 +50,6 @@ Replace () {
fi
}
Replace '\-lssl' "$ArchDirPath\/libssl\.a"
Replace '\-lcrypto' "$ArchDirPath\/libcrypto\.a"
Replace '\-lz' "$ArchDirPath\/libz\.a"
Replace '\-llzma' "$ArchDirPath\/liblzma\.a"
Replace '\-lXi' "$ArchDirPath\/libXi\.a $ArchDirPath\/libXext\.a"
Replace '\-lSM' "$ArchDirPath\/libSM\.a"
@ -58,6 +57,7 @@ Replace '\-lICE' "$ArchDirPath\/libICE\.a"
Replace '\-lfontconfig' "$ArchDirPath\/libfontconfig\.a $ArchDirPath\/libexpat\.a"
Replace '\-lfreetype' "$ArchDirPath\/libfreetype\.a"
Replace '\-lXext' "$ArchDirPath\/libXext\.a"
Replace '\-lz' "$LocalDirPath\/libz\.a"
Replace '\-lopus' "$LocalDirPath\/libopus\.a"
Replace '\-lopenal' "$LocalDirPath\/libopenal\.a"
Replace '\-lavformat' "$LocalDirPath\/libavformat\.a"
@ -66,4 +66,5 @@ Replace '\-lswresample' "$LocalDirPath\/libswresample\.a"
Replace '\-lswscale' "$LocalDirPath\/libswscale\.a"
Replace '\-lavutil' "$LocalDirPath\/libavutil\.a"
Replace '\-lva-x11' "$LocalDirPath\/libva-x11\.a"
Replace '\-lva-drm' "$LocalDirPath\/libva-drm\.a"
Replace '\-lva' "$LocalDirPath\/libva\.a"