diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-02-07 06:49:04 +0000 |
|---|---|---|
| committer | Sergey Belyashov <Sergey.Belyashov@gmail.com> | 2013-02-07 08:37:44 +0100 |
| commit | 27966cb75d8a95c4ada1fbd2f5ee19cf66199842 (patch) | |
| tree | 70419232c44cefc4725b7f173b70b5e4ada98971 /src/serialport/qserialport_unix_p.h | |
| parent | c07b1c4b615a5152dfbdb1c3e7cbcea9e3d82efa (diff) | |
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/qserialport_unix_p.h')
| -rw-r--r-- | src/serialport/qserialport_unix_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/serialport/qserialport_unix_p.h b/src/serialport/qserialport_unix_p.h index f9139955..fccd2ffe 100644 --- a/src/serialport/qserialport_unix_p.h +++ b/src/serialport/qserialport_unix_p.h @@ -51,6 +51,8 @@ # include <linux/serial.h> #endif +QT_BEGIN_NAMESPACE + class QSocketNotifier; QT_BEGIN_NAMESPACE_SERIALPORT @@ -153,4 +155,6 @@ private: QT_END_NAMESPACE_SERIALPORT +QT_END_NAMESPACE + #endif // QSERIALPORT_UNIX_P_H |