From c95fc3c3b1fdad5e75fe1c093f41fd54f8828ca4 Mon Sep 17 00:00:00 2001
From: Qt4iOS <ian@mediator-software.com>
Date: Sat, 24 Mar 2012 14:49:52 +0000
Subject: Fix compilation when QT_NO_PRINTDIALOG is defined.

Some code intended to be disabled when QT_NO_PRINTDIALOG is defined
was being compiled due to misplaced #ifdef and/or #endif.

Change-Id: Ic8587872fae03cac2895e54e34f8f20cb575d92b
Reviewed-by: John Layt <jlayt@kde.org>
---
 src/printsupport/dialogs/qpagesetupdialog_mac.mm | 4 ++--
 src/printsupport/dialogs/qprintdialog_unix.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/printsupport/dialogs')

diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
index 6e4469e387..512c4dc2a6 100644
--- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm
+++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#ifndef QT_NO_PRINTDIALOG
+
 #include <Cocoa/Cocoa.h>
 
 #include "qpagesetupdialog.h"
@@ -47,8 +49,6 @@
 #include <QtGui/qplatformnativeinterface_qpa.h>
 #include <QtPrintSupport/qprintengine.h>
 
-#ifndef QT_NO_PRINTDIALOG
-
 QT_USE_NAMESPACE
 
 @class QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate);
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index 5c5ca77a72..f3f7eea988 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -178,7 +178,6 @@ private:
     const ppd_file_t* cupsPPD;
 #endif
 };
-#endif
 
 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
 class QOptionTreeItem
@@ -1245,7 +1244,8 @@ void QPPDOptionsEditor::cbChanged(int)
 */
 }
 
-#endif
+#endif // !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#endif // defined (Q_OS_UNIX)
 
 QT_END_NAMESPACE
 
-- 
cgit v1.2.3