diff --git a/src/plugins/tools/view_25d/lay_plugin/layD25View.cc b/src/plugins/tools/view_25d/lay_plugin/layD25View.cc index 603136699..0300a37f1 100644 --- a/src/plugins/tools/view_25d/lay_plugin/layD25View.cc +++ b/src/plugins/tools/view_25d/lay_plugin/layD25View.cc @@ -115,9 +115,7 @@ D25View::menu_activated (const std::string &symbol) static QString scale_factor_to_string (double f) { - QString s; - s.sprintf ("%.3g", f); - return s; + return QString (QString::fromUtf8 ("%.3g").arg (f)); } void diff --git a/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc b/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc index 3eb97dfee..f7fc735ad 100644 --- a/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc +++ b/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc @@ -244,8 +244,13 @@ D25ViewWidget::wheelEvent (QWheelEvent *event) return; } +#if QT_VERSION >= 0x60000 + double px = (event->position ().x () - width () / 2) * 2.0 / width (); + double py = -(event->position ().y () - height () / 2) * 2.0 / height (); +#else double px = (event->pos ().x () - width () / 2) * 2.0 / width (); double py = -(event->pos ().y () - height () / 2) * 2.0 / height (); +#endif if (top_view ()) { @@ -389,7 +394,7 @@ D25ViewWidget::mousePressEvent (QMouseEvent *event) { mp_mode.reset (0); - if (event->button () == Qt::MidButton) { + if (event->button () == Qt::MiddleButton) { mp_mode.reset (new D25PanInteractionMode (this, event->pos ())); } else if (event->button () == Qt::LeftButton) { if (! top_view ()) { diff --git a/src/plugins/tools/view_25d/lay_plugin/lay_plugin.pro b/src/plugins/tools/view_25d/lay_plugin/lay_plugin.pro index 2ef786e9b..b05f93e94 100644 --- a/src/plugins/tools/view_25d/lay_plugin/lay_plugin.pro +++ b/src/plugins/tools/view_25d/lay_plugin/lay_plugin.pro @@ -25,3 +25,7 @@ SOURCES = \ FORMS = \ D25View.ui \ + +greaterThan(QT_MAJOR_VERSION, 5) { + QT += openglwidgets +} diff --git a/src/plugins/tools/view_25d/view_25d.pro b/src/plugins/tools/view_25d/view_25d.pro index fe4a52dc7..138f0890d 100644 --- a/src/plugins/tools/view_25d/view_25d.pro +++ b/src/plugins/tools/view_25d/view_25d.pro @@ -7,10 +7,6 @@ contains(QT_CONFIG, opengl) { SUBDIRS = lay_plugin unit_tests } - greaterThan(QT_MAJOR_VERSION, 5) { - QT += openglwidgets - } - unit_tests.depends += lay_plugin }