From 791edd0064c53b543f7926dd67da8bfa024a33f3 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Thu, 20 Feb 2014 16:06:56 +0000 Subject: [PATCH] change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility) --- src/meshlab/stdpardialog.cpp | 2 +- src/meshlab/xmlstdpardialog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meshlab/stdpardialog.cpp b/src/meshlab/stdpardialog.cpp index d8efcca1d..93ecc77a0 100644 --- a/src/meshlab/stdpardialog.cpp +++ b/src/meshlab/stdpardialog.cpp @@ -166,7 +166,7 @@ void MeshlabStdDialog::loadFrameContent(MeshDocument *mdPt) QPushButton *applyButton = new QPushButton("Apply", qf); QPushButton *defaultButton = new QPushButton("Default", qf); applyButton->setFocus(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC // Hack needed on mac for correct sizes of button in the bottom of the dialog. helpButton->setMinimumSize(100, 25); closeButton->setMinimumSize(100,25); diff --git a/src/meshlab/xmlstdpardialog.cpp b/src/meshlab/xmlstdpardialog.cpp index e20bf8d45..baa9ae975 100644 --- a/src/meshlab/xmlstdpardialog.cpp +++ b/src/meshlab/xmlstdpardialog.cpp @@ -71,7 +71,7 @@ void MeshLabXMLStdDialog::loadFrameContent( ) applyButton->setFocus(); bool onlyimportant = true; connect(this->parentWidget(),SIGNAL(filterExecuted()),this,SLOT(postFilterExecution())); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC // Hack needed on mac for correct sizes of button in the bottom of the dialog. helpButton->setMinimumSize(100, 25); closeButton->setMinimumSize(100,25);