Use new Q_OS_* macros.

core/utils.cpp

@@ -26,7 +26,7 @@
   #include <QX11Info>
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 #include <ApplicationServices/ApplicationServices.h>
 #include <IOKit/graphics/IOGraphicsLib.h>
 #endif
@@ -188,7 +188,7 @@ QSizeF Utils::realDpi(QWidget* widgetOnScreen)
     return res;
 }
 
-#elif defined(Q_WS_MAC)
+#elif defined(Q_OS_MAC)
     /*
      * Code copied from http://developer.apple.com/qa/qa2001/qa1217.html
      */

generators/poppler/generator_pdf.cpp

@@ -81,7 +81,7 @@ class PDFOptionsPage : public QWidget
            layout->addWidget(m_forceRaster);
            layout->addStretch(1);
 
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
            m_printAnnots->setVisible( false );
 #endif
            setPrintAnnots( true ); // Default value
@@ -969,7 +969,7 @@ void PDFGenerator::requestFontData(const Okular::FontInfo &font, QByteArray *dat
 #define DUMMY_QPRINTER_COPY
 bool PDFGenerator::print( QPrinter& printer )
 {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     QPainter painter;
     painter.begin(&printer);
 

part.cpp

@@ -2627,7 +2627,7 @@ void Part::slotPrint()
 {
     if (m_document->pages() == 0) return;
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     QPrinter printer(QPrinter::HighResolution);
 #else
     QPrinter printer;