summaryrefslogtreecommitdiffstats
path: root/src/printsupport/kernel
diff options
context:
space:
mode:
authorSergei Kulik <sergey@neatvideo.com>2015-03-10 15:12:00 +1100
committerTimur Pocheptsov <Timur.Pocheptsov@digia.com>2015-03-20 07:05:03 +0000
commit97edc8ede23f0e81c7b58f0613c4f67def1e8a3c (patch)
treecb69468767b7f1a5c869fda800678f4a7a61af9b /src/printsupport/kernel
parent282ba9a1802526ecdfbec512ac452e767608f8e3 (diff)
Fixed compilation on Mac OS X (qt namespace and preprocessor issues))
Configured with -qtnamespace <...> -no-opengl -D QT_NO_PRINTER Change-Id: I1c959a89afda08d29a854f21e6e51732d136753c Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/printsupport/kernel')
-rw-r--r--src/printsupport/kernel/qplatformprintdevice.h4
-rw-r--r--src/printsupport/kernel/qprintdevice_p.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/printsupport/kernel/qplatformprintdevice.h b/src/printsupport/kernel/qplatformprintdevice.h
index cb8c47f99e..1e21e608ad 100644
--- a/src/printsupport/kernel/qplatformprintdevice.h
+++ b/src/printsupport/kernel/qplatformprintdevice.h
@@ -173,8 +173,8 @@ protected:
#endif
};
-QT_END_NAMESPACE
-
#endif // QT_NO_PRINTER
+QT_END_NAMESPACE
+
#endif // QPLATFORMPRINTDEVICE_H
diff --git a/src/printsupport/kernel/qprintdevice_p.h b/src/printsupport/kernel/qprintdevice_p.h
index 0250b937bd..6117239ac7 100644
--- a/src/printsupport/kernel/qprintdevice_p.h
+++ b/src/printsupport/kernel/qprintdevice_p.h
@@ -136,8 +136,8 @@ private:
Q_DECLARE_SHARED(QPrintDevice)
-QT_END_NAMESPACE
-
#endif // QT_NO_PRINTER
+QT_END_NAMESPACE
+
#endif // QPLATFORMPRINTDEVICE_H