dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-06 06:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix macOS travis CI

Browse Source
This commit is contained in:
Le Tan 2018-04-18 21:35:48 +08:00
parent 108ff1543c
commit 91483fd8fc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis_macos.sh
View File

@ -6,6 +6,8 @@ brew update > /dev/null
# Use Qt5.9.3 instead of 5.10 # Use Qt5.9.3 instead of 5.10
cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula
git checkout 13d52537d1e0e5f913de4639012 qt.rb git checkout 13d52537d1e0e5f913de4639012 qt.rb
sed -i '' 's/:mysql/"mysql"/' qt.rb
sed -i '' 's/:postgresql/"postgresql"/' qt.rb
brew install qt brew install qt
QTDIR="/usr/local/opt/qt" QTDIR="/usr/local/opt/qt"

2
src/vmathjaxinplacepreviewhelper.cpp
View File

@ -230,7 +230,7 @@ void VMathJaxInplacePreviewHelper::textToHtmlFinished(int p_identitifer,
int p_timeStamp, int p_timeStamp,
const QString &p_html) const QString &p_html)
{ {
if (m_documentID != p_identitifer || m_timeStamp != p_timeStamp) { if (m_documentID != p_identitifer || m_timeStamp != (TS)p_timeStamp) {
return; return;
} }