obtain qt5.6 from the previous version
This commit is contained in:
parent
5bdd2f55e9
commit
85f887ae17
3 changed files with 7 additions and 2 deletions
|
@ -4,7 +4,7 @@ pushd thirdparty/tiff-4.0.3
|
||||||
popd
|
popd
|
||||||
cd toonz && mkdir build && cd build
|
cd toonz && mkdir build && cd build
|
||||||
cmake ../sources \
|
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/ \
|
-DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
|
||||||
-DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
|
-DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
|
||||||
make
|
make
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
brew update
|
brew update
|
||||||
brew install qt56 glew lz4 lzo libusb libmypaint
|
brew install glew lz4 lzo libusb libmypaint
|
||||||
brew tap tcr/tcr
|
brew tap tcr/tcr
|
||||||
brew install clang-format
|
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
|
||||||
|
|
|
@ -45,7 +45,9 @@
|
||||||
#include <QCamera>
|
#include <QCamera>
|
||||||
#include <QCameraImageCapture>
|
#include <QCameraImageCapture>
|
||||||
#include <QCameraViewfinderSettings>
|
#include <QCameraViewfinderSettings>
|
||||||
|
#ifdef MACOSX
|
||||||
#include <QCameraViewfinder>
|
#include <QCameraViewfinder>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
|
Loading…
Reference in a new issue