diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-02-06 08:13:52 +0000 |
|---|---|---|
| committer | Laszlo Papp <lpapp@kde.org> | 2013-02-06 10:52:26 +0100 |
| commit | c97d325ab51c132e784b440d6f81841a1060607c (patch) | |
| tree | 7f11486b6dc4ec71d6393c59bd72662939ce3109 /src/serialport/qserialportinfo.h | |
| parent | c8ec94a154242ef1102bca23953087608bee734c (diff) | |
Start using the Qt namespace defines and clean up the mess in the global header
This change brings one step closer to the removal of the serialport namespace
define, but it has to wait for an agreement first.
This change fixes a couple of warnings when trying to build with Qt5.
Change-Id: I013efb24019817e1a6f650a5c32bc32464ca3bf0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialportinfo.h')
| -rw-r--r-- | src/serialport/qserialportinfo.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/serialport/qserialportinfo.h b/src/serialport/qserialportinfo.h index a553daa5..7ab43bb0 100644 --- a/src/serialport/qserialportinfo.h +++ b/src/serialport/qserialportinfo.h @@ -48,6 +48,8 @@ #include "qserialport-global.h" +QT_BEGIN_NAMESPACE + QT_BEGIN_NAMESPACE_SERIALPORT class QSerialPort; @@ -90,4 +92,6 @@ inline bool QSerialPortInfo::isNull() const QT_END_NAMESPACE_SERIALPORT +QT_END_NAMESPACE + #endif // QSERIALPORTINFO_H |