summaryrefslogtreecommitdiff
path: root/src/serialport/qserialportinfo_p.h
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2013-02-07 06:49:04 +0000
committerSergey Belyashov <Sergey.Belyashov@gmail.com>2013-02-07 08:37:44 +0100
commit27966cb75d8a95c4ada1fbd2f5ee19cf66199842 (patch)
tree70419232c44cefc4725b7f173b70b5e4ada98971 /src/serialport/qserialportinfo_p.h
parentc07b1c4b615a5152dfbdb1c3e7cbcea9e3d82efa (diff)
downloadqtserialport-27966cb75d8a95c4ada1fbd2f5ee19cf66199842.tar.gz
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 <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialportinfo_p.h')
-rw-r--r--src/serialport/qserialportinfo_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/serialport/qserialportinfo_p.h b/src/serialport/qserialportinfo_p.h
index a5f8bba..436bbd2 100644
--- a/src/serialport/qserialportinfo_p.h
+++ b/src/serialport/qserialportinfo_p.h
@@ -48,6 +48,8 @@
#include <QtCore/qstring.h>
+QT_BEGIN_NAMESPACE
+
QT_BEGIN_NAMESPACE_SERIALPORT
class QSerialPortInfoPrivate
@@ -74,4 +76,6 @@ public:
QT_END_NAMESPACE_SERIALPORT
+QT_END_NAMESPACE
+
#endif // QSERIALPORTINFO_P_H