From 91483fd8fc2eaab1e0931a7e1df1492b0a7c7025 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Wed, 18 Apr 2018 21:35:48 +0800 Subject: [PATCH] fix macOS travis CI --- .travis_macos.sh | 2 ++ src/vmathjaxinplacepreviewhelper.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis_macos.sh b/.travis_macos.sh index 1d4a5a3b..203dc482 100644 --- a/.travis_macos.sh +++ b/.travis_macos.sh @@ -6,6 +6,8 @@ brew update > /dev/null # Use Qt5.9.3 instead of 5.10 cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula git checkout 13d52537d1e0e5f913de4639012 qt.rb +sed -i '' 's/:mysql/"mysql"/' qt.rb +sed -i '' 's/:postgresql/"postgresql"/' qt.rb brew install qt QTDIR="/usr/local/opt/qt" diff --git a/src/vmathjaxinplacepreviewhelper.cpp b/src/vmathjaxinplacepreviewhelper.cpp index 299aa7a8..f454f26e 100644 --- a/src/vmathjaxinplacepreviewhelper.cpp +++ b/src/vmathjaxinplacepreviewhelper.cpp @@ -230,7 +230,7 @@ void VMathJaxInplacePreviewHelper::textToHtmlFinished(int p_identitifer, int p_timeStamp, const QString &p_html) { - if (m_documentID != p_identitifer || m_timeStamp != p_timeStamp) { + if (m_documentID != p_identitifer || m_timeStamp != (TS)p_timeStamp) { return; }