3 files changed, 14 insertions, 17 deletions
diff --git a/src/printsupport/dialogs/dialogs.pri b/src/printsupport/dialogs/dialogs.pri
index 8d4f7b83ef..68b1737d73 100644
--- a/src/printsupport/dialogs/dialogs.pri
+++ b/src/printsupport/dialogs/dialogs.pri
@@ -9,10 +9,10 @@ HEADERS += \
         dialogs/qprintdialog.h \
         dialogs/qprintpreviewdialog.h
 
-!qpa:mac {
+# ### fixme
+false {
     OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \
                          dialogs/qprintdialog_mac.mm
-
 }
 
 win32 {
@@ -20,13 +20,13 @@ win32 {
                dialogs/qprintdialog_win.cpp
 }
 
-!mac:!symbian:unix|qpa:!win32 {
-        HEADERS += dialogs/qpagesetupdialog_unix_p.h
-        SOURCES += dialogs/qprintdialog_unix.cpp \
-                   dialogs/qpagesetupdialog_unix.cpp
-        FORMS += dialogs/qprintsettingsoutput.ui \
-        dialogs/qprintwidget.ui \
-        dialogs/qprintpropertieswidget.ui
+unix {
+    HEADERS += dialogs/qpagesetupdialog_unix_p.h
+    SOURCES += dialogs/qprintdialog_unix.cpp \
+               dialogs/qpagesetupdialog_unix.cpp
+    FORMS += dialogs/qprintsettingsoutput.ui \
+    dialogs/qprintwidget.ui \
+    dialogs/qprintpropertieswidget.ui
 }
 
 INCLUDEPATH += $$PWD
diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h
index f9017ec59b..06ad99d02e 100644
--- a/src/printsupport/dialogs/qprintdialog.h
+++ b/src/printsupport/dialogs/qprintdialog.h
@@ -56,7 +56,7 @@ class QPrintDialogPrivate;
 class QPushButton;
 class QPrinter;
 
-#if defined (Q_OS_UNIX) && !defined(QTOPIA_PRINTDIALOG) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN)
+#if defined (Q_OS_UNIX)
 class QUnixPrintWidgetPrivate;
 
 class Q_PRINTSUPPORT_EXPORT QUnixPrintWidget : public QWidget
@@ -91,7 +91,7 @@ public:
     ~QPrintDialog();
 
     int exec();
-#if defined (Q_OS_UNIX) && !defined(QTOPIA_PRINTDIALOG) && !defined(Q_WS_MAC)
+#if defined (Q_OS_UNIX)
     virtual void accept();
 #endif
     void done(int result);
@@ -101,7 +101,7 @@ public:
     void setOptions(PrintDialogOptions options);
     PrintDialogOptions options() const;
 
-#if defined(Q_OS_UNIX) || defined(Q_WS_MAC) || defined(Q_OS_WIN)
+#if defined(Q_OS_UNIX) || defined(Q_OS_WIN)
     void setVisible(bool visible);
 #endif
 
@@ -137,10 +137,10 @@ Q_SIGNALS:
 private:
 #ifndef QTOPIA_PRINTDIALOG
     Q_PRIVATE_SLOT(d_func(), void _q_chbPrintLastFirstToggled(bool))
-#if defined (Q_OS_UNIX) && !defined (Q_OS_MAC)
+#if defined (Q_OS_UNIX)
     Q_PRIVATE_SLOT(d_func(), void _q_collapseOrExpandDialog())
 #endif
-# if defined(Q_OS_UNIX) && !defined (Q_OS_MAC) && !defined(QT_NO_MESSAGEBOX)
+# if defined(Q_OS_UNIX) && !defined(QT_NO_MESSAGEBOX)
     Q_PRIVATE_SLOT(d_func(), void _q_checkFields())
 # endif
 #else // QTOPIA_PRINTDIALOG
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index 049a45b1fd..d503623bae 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -140,7 +140,6 @@ public:
     QPushButton *collapseButton;
 };
 
-#if defined (Q_OS_UNIX)
 class QUnixPrintWidgetPrivate
 {
 public:
@@ -1005,8 +1004,6 @@ void QUnixPrintWidget::updatePrinter()
     d->setupPrinter();
 }
 
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)