From 85f887ae17e10e4029727379cbca2d995a258696 Mon Sep 17 00:00:00 2001
From: shun_iwasawa <shun_iwasawa@dwango.co.jp>
Date: Tue, 8 Aug 2017 14:38:55 +0900
Subject: [PATCH] obtain qt5.6 from the previous version

---
 ci-scripts/osx/travis-build.sh          | 2 +-
 ci-scripts/osx/travis-install.sh        | 5 ++++-
 toonz/sources/toonz/penciltestpopup.cpp | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ci-scripts/osx/travis-build.sh b/ci-scripts/osx/travis-build.sh
index cbe2a231..a8671414 100644
--- a/ci-scripts/osx/travis-build.sh
+++ b/ci-scripts/osx/travis-build.sh
@@ -4,7 +4,7 @@ pushd thirdparty/tiff-4.0.3
 popd
 cd toonz && mkdir build && cd build
 cmake ../sources \
-      -DQT_PATH=/usr/local/Cellar/qt@5.5/5.5.1_1/lib/ \
+      -DQT_PATH=/usr/local/Cellar/qt5/5.6.1-1/lib/ \
       -DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
       -DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
 make
diff --git a/ci-scripts/osx/travis-install.sh b/ci-scripts/osx/travis-install.sh
index 489a906f..b64e43c5 100755
--- a/ci-scripts/osx/travis-install.sh
+++ b/ci-scripts/osx/travis-install.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 brew update
-brew install qt56 glew lz4 lzo libusb libmypaint
+brew install glew lz4 lzo libusb libmypaint
 brew tap tcr/tcr
 brew install clang-format
+# obtain qt5.6 from the previous version of the formula
+curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/fdfc724dd532345f5c6cdf47dc43e99654e6a5fd/Formula/qt5.rb
+brew install ./qt5.rb
diff --git a/toonz/sources/toonz/penciltestpopup.cpp b/toonz/sources/toonz/penciltestpopup.cpp
index c7dfd958..e3e8b2d3 100644
--- a/toonz/sources/toonz/penciltestpopup.cpp
+++ b/toonz/sources/toonz/penciltestpopup.cpp
@@ -45,7 +45,9 @@
 #include <QCamera>
 #include <QCameraImageCapture>
 #include <QCameraViewfinderSettings>
+#ifdef MACOSX
 #include <QCameraViewfinder>
+#endif
 
 #include <QComboBox>
 #include <QPushButton>