comparison src/panner.cpp @ 666:98a7fbbe9d88 qt5

Merge from default branch, and build fixes
author Chris Cannam
date Fri, 27 May 2016 09:55:56 +0100
parents 88061103b878
children
comparison
equal deleted inserted replaced
663:f9b805d8cab4 666:98a7fbbe9d88
57 // Similarly, but horizontal 57 // Similarly, but horizontal
58 if (r.width() < width() * 2) { 58 if (r.width() < width() * 2) {
59 m = Qt::KeepAspectRatio; 59 m = Qt::KeepAspectRatio;
60 } 60 }
61 } 61 }
62 DEBUG << "Panner: fit mode " << m << endl; 62 DEBUG << "Panner: fit mode " << int(m) << endl;
63 fitInView(r, m); 63 fitInView(r, m);
64 } 64 }
65 65
66 void 66 void
67 Panner::setScene(QGraphicsScene *s) 67 Panner::setScene(QGraphicsScene *s)