From 9c4036ce6aea48ecefd6c9b5269f0c178dc8453e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 18 Jul 2013 14:03:54 +0200 Subject: [PATCH] fix namespaced build rule 1: QT_USE_NAMESPACE in qt code itself is a bad idea rule 2: don't forget to forward-declare your non-qt types Change-Id: Ifba69328f3451e708c26624f349485e7c61d31f5 Reviewed-by: Jan Arne Petersen Reviewed-by: Oswald Buddenhagen --- src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp index d7e51144026..94a107c8125 100644 --- a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp +++ b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp @@ -46,7 +46,7 @@ #include #include -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE QByteArray QWaylandMimeHelper::getByteArray(QMimeData *mimeData, const QString &mimeType) { @@ -83,3 +83,5 @@ QByteArray QWaylandMimeHelper::getByteArray(QMimeData *mimeData, const QString & } return content; } + +QT_END_NAMESPACE