Remove the QtSerialPort namespace define and hence namespace usage

* This is for following the convention in the Qt Project with the rest.

* This fixes examples and tests to build now as all of them are broken due to
the regression.

Change-Id: I3f4d64d97466520aea621da582a64a0d97e32136
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>

38 files changed, 18 insertions, 108 deletions

diff --git a/examples/blockingmaster/dialog.cpp b/examples/blockingmaster/dialog.cpp
index 1686ad97..7cd04e02 100644
--- a/examples/blockingmaster/dialog.cpp
+++ b/examples/blockingmaster/dialog.cpp
@@ -50,7 +50,7 @@
 
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent)
diff --git a/examples/blockingmaster/masterthread.cpp b/examples/blockingmaster/masterthread.cpp
index 8d72b42e..1ca38f48 100644
--- a/examples/blockingmaster/masterthread.cpp
+++ b/examples/blockingmaster/masterthread.cpp
@@ -45,7 +45,7 @@
 
 #include <QTime>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 MasterThread::MasterThread(QObject *parent)
     : QThread(parent), waitTimeout(0), quit(false)
diff --git a/examples/blockingslave/dialog.cpp b/examples/blockingslave/dialog.cpp
index 947de74a..9bdbbf67 100644
--- a/examples/blockingslave/dialog.cpp
+++ b/examples/blockingslave/dialog.cpp
@@ -50,7 +50,7 @@
 
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent)
diff --git a/examples/blockingslave/slavethread.cpp b/examples/blockingslave/slavethread.cpp
index 678c19f1..9b49edba 100644
--- a/examples/blockingslave/slavethread.cpp
+++ b/examples/blockingslave/slavethread.cpp
@@ -45,7 +45,7 @@
 
 #include <QTime>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 SlaveThread::SlaveThread(QObject *parent)
     : QThread(parent), waitTimeout(0), quit(false)
diff --git a/examples/cenumerator/main.cpp b/examples/cenumerator/main.cpp
index a67fac6a..f2034963 100644
--- a/examples/cenumerator/main.cpp
+++ b/examples/cenumerator/main.cpp
@@ -43,7 +43,7 @@
 #include <QCoreApplication>
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/enumerator/main.cpp b/examples/enumerator/main.cpp
index 15e43514..0bd3fc04 100644
--- a/examples/enumerator/main.cpp
+++ b/examples/enumerator/main.cpp
@@ -46,7 +46,7 @@
 #include <QLabel>
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/master/dialog.cpp b/examples/master/dialog.cpp
index 4319a5bf..0a27575c 100644
--- a/examples/master/dialog.cpp
+++ b/examples/master/dialog.cpp
@@ -50,7 +50,7 @@
 
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent)
diff --git a/examples/master/dialog.h b/examples/master/dialog.h
index 6f6d64cc..f8944a8a 100644
--- a/examples/master/dialog.h
+++ b/examples/master/dialog.h
@@ -47,7 +47,7 @@
 
 #include <QtSerialPort/QSerialPort>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 class QLabel;
 class QLineEdit;
diff --git a/examples/slave/dialog.cpp b/examples/slave/dialog.cpp
index fcfb36c8..ddae52a0 100644
--- a/examples/slave/dialog.cpp
+++ b/examples/slave/dialog.cpp
@@ -50,7 +50,7 @@
 
 #include <QtSerialPort/QSerialPortInfo>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent)
diff --git a/examples/slave/dialog.h b/examples/slave/dialog.h
index bd3a4316..fcd34760 100644
--- a/examples/slave/dialog.h
+++ b/examples/slave/dialog.h
@@ -47,7 +47,7 @@
 
 #include <QtSerialPort/QSerialPort>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 class QLabel;
 class QLineEdit;
diff --git a/examples/slave/slavethread.cpp b/examples/slave/slavethread.cpp
index fc99c4a6..2a32454e 100644
--- a/examples/slave/slavethread.cpp
+++ b/examples/slave/slavethread.cpp
@@ -45,7 +45,7 @@
 
 #include <QTime>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 SlaveThread::SlaveThread(QObject *parent)
     : QThread(parent), waitTimeout(0), quit(false)
diff --git a/examples/terminal/mainwindow.h b/examples/terminal/mainwindow.h
index 24e9826c..ed85fe27 100644
--- a/examples/terminal/mainwindow.h
+++ b/examples/terminal/mainwindow.h
@@ -56,7 +56,7 @@ class MainWindow;
 class Console;
 class SettingsDialog;
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 class MainWindow : public QMainWindow
 {
diff --git a/examples/terminal/settingsdialog.cpp b/examples/terminal/settingsdialog.cpp
index a125db40..f0779331 100644
--- a/examples/terminal/settingsdialog.cpp
+++ b/examples/terminal/settingsdialog.cpp
@@ -47,6 +47,8 @@
 #include <QIntValidator>
 #include <QLineEdit>
 
+QT_USE_NAMESPACE
+
 SettingsDialog::SettingsDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::SettingsDialog)
diff --git a/examples/terminal/settingsdialog.h b/examples/terminal/settingsdialog.h
index e156c5b1..b30518a4 100644
--- a/examples/terminal/settingsdialog.h
+++ b/examples/terminal/settingsdialog.h
@@ -46,14 +46,14 @@
 #include <QDialog>
 #include <QtSerialPort/QSerialPort>
 
+QT_USE_NAMESPACE
+
 namespace Ui {
 class SettingsDialog;
 }
 
 class QIntValidator;
 
-QT_USE_NAMESPACE_SERIALPORT
-
 class SettingsDialog : public QDialog
 {
     Q_OBJECT
diff --git a/src/serialport/doc/serialport.qdocconf b/src/serialport/doc/serialport.qdocconf
index f4b8b0c6..30b3e819 100644
--- a/src/serialport/doc/serialport.qdocconf
+++ b/src/serialport/doc/serialport.qdocconf
@@ -11,8 +11,6 @@ sourcedirs  = ./src ../src
 indexes = $QT5DOC/doc/html/qt.index
 
 Cpp.ignoretokens = \
-    QT_BEGIN_NAMESPACE_SERIALPORT \
-    QT_END_NAMESPACE_SERIALPORT \
     Q_ADDON_SERIALPORT_EXPORT
 
 Cpp.ignoredirectives = \
diff --git a/src/serialport/qserialport-global.h b/src/serialport/qserialport-global.h
index b0627270..dc43f4e1 100644
--- a/src/serialport/qserialport-global.h
+++ b/src/serialport/qserialport-global.h
@@ -53,16 +53,6 @@ QT_BEGIN_NAMESPACE
 #  define Q_SERIALPORT_EXPORT Q_DECL_IMPORT
 #endif
 
-#  define QT_BEGIN_NAMESPACE_SERIALPORT namespace QtSerialPort {
-#  define QT_END_NAMESPACE_SERIALPORT }
-#  define QT_USE_NAMESPACE_SERIALPORT using namespace QtSerialPort;
-
-// a workaround for moc - if there is a header file that doesn't use serialport
-// namespace, we still force moc to do "using namespace" but the namespace have to
-// be defined, so let's define an empty namespace here
-QT_BEGIN_NAMESPACE_SERIALPORT
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
 
 #endif // SERIALPORT_GLOBAL_H
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp
index 53a73d0b..397182b6 100644
--- a/src/serialport/qserialport.cpp
+++ b/src/serialport/qserialport.cpp
@@ -61,8 +61,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 QSerialPortPrivateData::QSerialPortPrivateData(QSerialPort *q)
     : readBufferMaxSize(0)
     , readBuffer(SERIALPORT_BUFFERSIZE)
@@ -1188,6 +1186,4 @@ void QSerialPort::setError(QSerialPort::SerialPortError error)
 
 #include "moc_qserialport.cpp"
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h
index 643a9273..26828206 100644
--- a/src/serialport/qserialport.h
+++ b/src/serialport/qserialport.h
@@ -49,8 +49,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 class QSerialPortInfo;
 class QSerialPortPrivate;
 
@@ -256,8 +254,6 @@ inline bool QSerialPort::clearBreak(bool clear)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QSerialPort::Directions)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QSerialPort::Lines)
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
 
 #endif // QSERIALPORT_H
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h
index d334adf3..a10cda26 100644
--- a/src/serialport/qserialport_p.h
+++ b/src/serialport/qserialport_p.h
@@ -54,8 +54,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 class QSerialPortPrivateData
 {
     Q_DECLARE_PUBLIC(QSerialPort)
@@ -84,8 +82,6 @@ public:
     QSerialPort * const q_ptr;
 };
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
 
 #endif // QSERIALPORT_P_H
diff --git a/src/serialport/qserialport_symbian.cpp b/src/serialport/qserialport_symbian.cpp
index c8628ca0..200dc063 100644
--- a/src/serialport/qserialport_symbian.cpp
+++ b/src/serialport/qserialport_symbian.cpp
@@ -49,8 +49,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 // Physical device driver.
 #ifdef __WINS__
 _LIT(KPddName, "ECDRV");
@@ -653,6 +651,4 @@ QList<qint32> QSerialPortPrivate::standardBaudRates()
     return ret;
 }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialport_symbian_p.h b/src/serialport/qserialport_symbian_p.h
index 5a0ca1a7..9e26fec9 100644
--- a/src/serialport/qserialport_symbian_p.h
+++ b/src/serialport/qserialport_symbian_p.h
@@ -48,8 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 class QSerialPortPrivate : public QSerialPortPrivateData
 {
 public:
@@ -115,8 +113,6 @@ private:
                             int msecs, bool *timedOut);
 };
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
 
 #endif // QSERIALPORT_SYMBIAN_P_H
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index 3fc5cba1..b1fab1d9 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -62,8 +62,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 class ReadNotifier : public QSocketNotifier
 {
 public:
@@ -1342,6 +1340,4 @@ QList<qint32> QSerialPortPrivate::standardBaudRates()
     return ret;
 }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialport_unix_p.h b/src/serialport/qserialport_unix_p.h
index fccd2ffe..79a84973 100644
--- a/src/serialport/qserialport_unix_p.h
+++ b/src/serialport/qserialport_unix_p.h
@@ -55,8 +55,6 @@ QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 class QSerialPortPrivate : public QSerialPortPrivateData
 {
 public:
@@ -153,8 +151,6 @@ private:
 
 };
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
 
 #endif // QSERIALPORT_UNIX_P_H
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index fad37cdb..5046eeae 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -87,8 +87,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 #ifndef Q_OS_WINCE
 
 class AbstractOverlappedEventNotifier : public QWinEventNotifier
@@ -1077,6 +1075,4 @@ QList<qint32> QSerialPortPrivate::standardBaudRates()
     return ret;
 }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialport_win_p.h b/src/serialport/qserialport_win_p.h
index 5f4f97b3..7f20a9de 100644
--- a/src/serialport/qserialport_win_p.h
+++ b/src/serialport/qserialport_win_p.h
@@ -57,8 +57,6 @@ class QThread;
 #include <QtCore/qmutex.h>
 #endif
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 #ifndef Q_OS_WINCE
 class AbstractOverlappedEventNotifier;
 #endif
@@ -159,8 +157,6 @@ private:
 
 };
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
 
 #endif // QSERIALPORT_WIN_P_H
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp
index 18835051..2382cdd7 100644
--- a/src/serialport/qserialport_wince.cpp
+++ b/src/serialport/qserialport_wince.cpp
@@ -50,8 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 class QSerialPortPrivate;
 
 class CommEventNotifier : public QThread
@@ -503,6 +501,4 @@ QString QSerialPortPrivate::portNameFromSystemLocation(const QString &location)
 
 #include "qserialport_wince.moc"
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp
index d62fdb1b..46793191 100644
--- a/src/serialport/qserialportinfo.cpp
+++ b/src/serialport/qserialportinfo.cpp
@@ -47,8 +47,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 
 /*!
     \class QSerialPortInfo
@@ -241,6 +239,4 @@ QString QSerialPortInfo::productIdentifier() const
     Returns a list of available serial ports on the system.
 */
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo.h b/src/serialport/qserialportinfo.h
index 7ef2fcba..ab54915a 100644
--- a/src/serialport/qserialportinfo.h
+++ b/src/serialport/qserialportinfo.h
@@ -50,8 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 class QSerialPort;
 class QSerialPortInfoPrivate;
 class QSerialPortInfoPrivateDeleter;
@@ -90,8 +88,6 @@ private:
 inline bool QSerialPortInfo::isNull() const
 { return !d_ptr; }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
 
 #endif // QSERIALPORTINFO_H
diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp
index b66f84d3..d9ab8d5d 100644
--- a/src/serialport/qserialportinfo_mac.cpp
+++ b/src/serialport/qserialportinfo_mac.cpp
@@ -59,8 +59,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 enum { MATCHING_PROPERTIES_COUNT = 6 };
 
 QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
@@ -263,6 +261,4 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
     return serialPortInfoList;
 }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo_p.h b/src/serialport/qserialportinfo_p.h
index 436bbd23..7c48ce51 100644
--- a/src/serialport/qserialportinfo_p.h
+++ b/src/serialport/qserialportinfo_p.h
@@ -50,8 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 class QSerialPortInfoPrivate
 {
 public:
@@ -74,8 +72,6 @@ public:
     }
 };
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
 
 #endif // QSERIALPORTINFO_P_H
diff --git a/src/serialport/qserialportinfo_symbian.cpp b/src/serialport/qserialportinfo_symbian.cpp
index 88293fab..6c46c9dc 100644
--- a/src/serialport/qserialportinfo_symbian.cpp
+++ b/src/serialport/qserialportinfo_symbian.cpp
@@ -54,8 +54,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 // Physical device driver.
 #ifdef __WINS__
 _LIT(KPddName, "ECDRV");
@@ -248,6 +246,4 @@ bool QSerialPortInfo::isValid() const
     return r == KErrNone || r == KErrLocked;
 }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp
index 4b161446..c474e750 100644
--- a/src/serialport/qserialportinfo_unix.cpp
+++ b/src/serialport/qserialportinfo_unix.cpp
@@ -63,8 +63,6 @@ extern "C"
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 #ifndef Q_OS_MAC
 
 #if !(defined (Q_OS_LINUX) && defined (HAVE_LIBUDEV))
@@ -255,6 +253,4 @@ bool QSerialPortInfo::isValid() const
     return f.exists();
 }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp
index 74cfffb3..37880a70 100644
--- a/src/serialport/qserialportinfo_win.cpp
+++ b/src/serialport/qserialportinfo_win.cpp
@@ -55,8 +55,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 #ifndef Q_OS_WINCE
 
 static const GUID guidsArray[] =
@@ -230,6 +228,4 @@ bool QSerialPortInfo::isValid() const
     return true;
 }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qserialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp
index fd5ae31c..279aceae 100644
--- a/src/serialport/qserialportinfo_wince.cpp
+++ b/src/serialport/qserialportinfo_wince.cpp
@@ -49,8 +49,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 static QString findDescription(HKEY parentKeyHandle, const QString &subKey)
 {
     const static QString valueName(QLatin1String("FriendlyName"));
@@ -133,6 +131,4 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
     return serialPortInfoList;
 }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qttylocker_unix.cpp b/src/serialport/qttylocker_unix.cpp
index 15aee0c6..88545d98 100644
--- a/src/serialport/qttylocker_unix.cpp
+++ b/src/serialport/qttylocker_unix.cpp
@@ -60,8 +60,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 #if !(defined (HAVE_BAUDBOY_H) || defined (HAVE_LOCKDEV_H))
 
 static
@@ -179,6 +177,4 @@ bool QTtyLocker::isLocked(const char *portName, bool *currentPid)
 #endif
 }
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
diff --git a/src/serialport/qttylocker_unix_p.h b/src/serialport/qttylocker_unix_p.h
index 4e3c786d..4e2f55dc 100644
--- a/src/serialport/qttylocker_unix_p.h
+++ b/src/serialport/qttylocker_unix_p.h
@@ -46,8 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_NAMESPACE_SERIALPORT
-
 class QTtyLocker
 {
 public:
@@ -56,8 +54,6 @@ public:
     static bool isLocked(const char *portName, bool *currentPid);
 };
 
-QT_END_NAMESPACE_SERIALPORT
-
 QT_END_NAMESPACE
 
 #endif // TTYLOCKER_UNIX_P_H
diff --git a/tests/manual/qserialport/tst_qserialport.cpp b/tests/manual/qserialport/tst_qserialport.cpp
index 7dcbc042..17d4d67d 100644
--- a/tests/manual/qserialport/tst_qserialport.cpp
+++ b/tests/manual/qserialport/tst_qserialport.cpp
@@ -45,7 +45,7 @@
 #include <QtSerialPort/qserialportinfo.h>
 #include <QtSerialPort/qserialport.h>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 class tst_QSerialPort : public QObject
 {
diff --git a/tests/manual/qserialportinfo/tst_qserialportinfo.cpp b/tests/manual/qserialportinfo/tst_qserialportinfo.cpp
index 2a7fa56b..df7ea432 100644
--- a/tests/manual/qserialportinfo/tst_qserialportinfo.cpp
+++ b/tests/manual/qserialportinfo/tst_qserialportinfo.cpp
@@ -45,7 +45,7 @@
 #include <QtSerialPort/qserialportinfo.h>
 #include <QtSerialPort/qserialport.h>
 
-QT_USE_NAMESPACE_SERIALPORT
+QT_USE_NAMESPACE
 
 class tst_QSerialPortInfo : public QObject
 {