revert travis to qt5.5 for osx build

This commit is contained in:
shun_iwasawa 2017-04-19 19:40:52 +09:00
parent 7c988d9428
commit f01305cc15
6 changed files with 7 additions and 19 deletions

View file

@ -4,7 +4,7 @@ pushd thirdparty/tiff-4.0.3
popd
cd toonz && mkdir build && cd build
cmake ../sources \
-DQT_PATH=/usr/local/Cellar/qt5/5.6.1-1/lib/ \
-DQT_PATH=/usr/local/Cellar/qt@5.5/5.5.1_1/lib/ \
-DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
-DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
make

View file

@ -1,8 +1,5 @@
#!/bin/bash
brew update
brew install glew lz4 lzo libusb
brew install qt55 glew lz4 lzo libusb
brew tap tcr/tcr
brew install clang-format
# revert to the previous version of the formula to get qt5.6.1-1
curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/fdfc724dd532345f5c6cdf47dc43e99654e6a5fd/Formula/qt5.rb
brew install ./qt5.rb

View file

@ -16,6 +16,9 @@ public:
Qt::WindowFlags f = Qt::WindowFlags())
: QGLWidget(parent, shareWidget, f) {}
// returns device-pixel ratio. It is 1 for normal monitors and 2 (or higher
// ratio) for high DPI monitors. Setting "Display > Set custom text size(DPI)"
// for Windows corresponds to this ratio.
int getDevPixRatio() const {
static int devPixRatio = QApplication::desktop()->devicePixelRatio();
return devPixRatio;

View file

@ -119,7 +119,7 @@ bool PreviewSubCameraManager::mousePressEvent(SceneViewer *viewer,
if (viewer->is3DView()) return true;
m_mousePressed = true;
m_mousePressPos = event->pos() * TApp::instance()->getDevPixRatio();
m_mousePressPos = event->pos() * viewer->getDevPixRatio();
m_dragType = getSubCameraDragEnum(viewer, m_mousePressPos);
if (bitwiseExclude(m_dragType, OUTER))
@ -133,7 +133,7 @@ bool PreviewSubCameraManager::mousePressEvent(SceneViewer *viewer,
bool PreviewSubCameraManager::mouseMoveEvent(SceneViewer *viewer,
QMouseEvent *event) {
if (viewer->is3DView()) return true;
QPoint curPos(event->pos() * TApp::instance()->getDevPixRatio());
QPoint curPos(event->pos() * viewer->getDevPixRatio());
if (event->buttons() == Qt::LeftButton) {
if (!bitwiseContains(m_dragType, INNER)) {
if (abs(curPos.x() - m_mousePressPos.x()) > 10 ||

View file

@ -739,10 +739,3 @@ QString TApp::getCurrentRoomName() const {
return currentRoom->getName();
}
//-----------------------------------------------------------------------------
int TApp::getDevPixRatio() const {
static int devPixRatio = QApplication::desktop()->devicePixelRatio();
return devPixRatio;
}

View file

@ -201,11 +201,6 @@ public:
void writeSettings();
// returns device-pixel ratio. It is 1 for normal monitors and 2 (or higher
// ratio) for high DPI monitors. Setting "Display > Set custom text size(DPI)"
// for Windows corresponds to this ratio.
int getDevPixRatio() const;
protected:
bool eventFilter(QObject *obj, QEvent *event) override;