Replace Q_WS_MAC with Q_OS_MAC in QtPrintSupport
authorBradley T. Hughes <bradley.hughes@nokia.com>
Thu, 1 Mar 2012 12:19:15 +0000 (13:19 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 5 Mar 2012 15:37:16 +0000 (16:37 +0100)
Change-Id: Ib19c87a72f74e28412a6060a83bf17d1d16a83ac
Reviewed-by: John Layt <jlayt@kde.org>
src/printsupport/dialogs/qprintpreviewdialog.cpp
src/printsupport/widgets/qprintpreviewwidget.cpp

index c7b4507..ce2362b 100644 (file)
@@ -271,7 +271,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
     QWidget *pageEdit = new QWidget(toolbar);
     QVBoxLayout *vboxLayout = new QVBoxLayout;
     vboxLayout->setContentsMargins(0, 0, 0, 0);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     // We query the widgets about their size and then we fix the size.
     // This should do the trick for the laying out part...
     QSize pageNumEditSize, pageNumLabelSize;
@@ -281,7 +281,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
     pageNumLabel->resize(pageNumLabelSize);
 #endif
     QFormLayout *formLayout = new QFormLayout;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     // We have to change the growth policy in Mac.
     formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
 #endif
@@ -560,7 +560,7 @@ void QPrintPreviewDialogPrivate::_q_print()
 {
     Q_Q(QPrintPreviewDialog);
 
-#if defined(Q_OS_WIN) || defined(Q_WS_MAC)
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
     if (printer->outputFormat() != QPrinter::NativeFormat) {
         QString title;
         QString suffix;
index 16aea23..abed052 100644 (file)
@@ -152,7 +152,7 @@ public:
     GraphicsView(QWidget* parent = 0)
         : QGraphicsView(parent)
     {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
         setFrameStyle(QFrame::NoFrame);
 #endif
     }