comparison view/View.cpp @ 1152:fc00a06feecd 3.0-integration

Merge from branch "msvc2015_64"
author Chris Cannam
date Thu, 20 Oct 2016 11:20:27 +0100
parents 52675a1f662c
children 57d192e26331 54e6be7ebe11
comparison
equal deleted inserted replaced
1149:0d04b1cdb9f9 1152:fc00a06feecd
43 #include <QSettings> 43 #include <QSettings>
44 44
45 #include <iostream> 45 #include <iostream>
46 #include <cassert> 46 #include <cassert>
47 #include <cmath> 47 #include <cmath>
48
49 #include <unistd.h>
50 48
51 //#define DEBUG_VIEW 1 49 //#define DEBUG_VIEW 1
52 //#define DEBUG_VIEW_WIDGET_PAINT 1 50 //#define DEBUG_VIEW_WIDGET_PAINT 1
53 51
54 View::View(QWidget *w, bool showProgress) : 52 View::View(QWidget *w, bool showProgress) :