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>
This commit is contained in:
parent
f1963324d2
commit
c95fc3c3b1
@ -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);
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user