diff options
| author | Marius Kintel <marius@kintel.net> | 2012-06-04 05:48:42 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-06-04 05:48:42 (GMT) |
| commit | 2836f0c37273aa41ba8280ee459ced418dbb74ea (patch) | |
| tree | 513ad0da109fb114ac637d9c0b1cdd3e74e52a10 /src | |
| parent | 5b366adf8a9fb1b677eb9340f97ec764a15e5425 (diff) | |
| parent | 6f65f92c6707147dd676094a98bdf715557bcb58 (diff) | |
Merge branch 'master' into caliston1
Diffstat (limited to 'src')
| -rw-r--r-- | src/glview.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/glview.cc b/src/glview.cc index aa2e746..bea5856 100644 --- a/src/glview.cc +++ b/src/glview.cc @@ -600,7 +600,11 @@ void GLView::mouseMoveEvent(QMouseEvent *event) double mz = -(dy) * viewer_distance/1000; double my = 0; +#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0)) + if (event->buttons() & Qt::MidButton) { +#else if (event->buttons() & Qt::MiddleButton) { +#endif my = mz; mz = 0; // actually lock the x-position |