From 27966cb75d8a95c4ada1fbd2f5ee19cf66199842 Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Thu, 7 Feb 2013 06:49:04 +0000 Subject: Fix the potential build breaks introduced by a previous commit (regression) This is due to the fact the Qt namespace is not considered which is normally not a problem as it is empty by default. However, using something like "-qtnamespace MyNamespace" when configuring Qt will break the QtSerialPort build completely. This is intended to be a fix for the library, and the examples/tests will be fixed in a separate commit if necessary. Change-Id: Iecd24dc5135c3a9645910754589dfd8bf4942337 Reviewed-by: Sergey Belyashov Reviewed-by: Denis Shienkov --- src/serialport/qserialport_p.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/serialport/qserialport_p.h') diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h index c365fb8..d334adf 100644 --- a/src/serialport/qserialport_p.h +++ b/src/serialport/qserialport_p.h @@ -52,6 +52,8 @@ #include "qt4support/qringbuffer_p.h" #endif +QT_BEGIN_NAMESPACE + QT_BEGIN_NAMESPACE_SERIALPORT class QSerialPortPrivateData @@ -84,4 +86,6 @@ public: QT_END_NAMESPACE_SERIALPORT +QT_END_NAMESPACE + #endif // QSERIALPORT_P_H -- cgit v1.2.1