10 files changed, 28 insertions, 31 deletions
diff --git a/src/serialport/doc/src/build.qdoc b/src/serialport/doc/src/build.qdoc
index 127dc53..0cdf798 100644
--- a/src/serialport/doc/src/build.qdoc
+++ b/src/serialport/doc/src/build.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Building and usage
     \page build.html
     \previouspage Get source
diff --git a/src/serialport/doc/src/getsrc.qdoc b/src/serialport/doc/src/getsrc.qdoc
index 8fcab95..92e3ef6 100644
--- a/src/serialport/doc/src/getsrc.qdoc
+++ b/src/serialport/doc/src/getsrc.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Get source
     \page getsrc.html
     \previouspage Introduction
diff --git a/src/serialport/doc/src/index.qdoc b/src/serialport/doc/src/index.qdoc
index e290804..f6b5d1a 100644
--- a/src/serialport/doc/src/index.qdoc
+++ b/src/serialport/doc/src/index.qdoc
@@ -26,18 +26,18 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
-    \title Qt Addon SerialPort Reference Documentation
+    \module QtSerialPort
+    \title QtSerialPort Reference Documentation
     \page index.html
 
-    \brief The QtAddonSerialPort module provides classes to make serial programming
+    \brief The QtSerialPort module provides classes to make serial programming
     easier and portable.
 
     To include the definitions of the module's classes, use the
     following directive:
 
     \code
-    #include <QtAddOnSerialPort/QtAddOnSerialPort>
+    #include <QtSerialPort/QtSerialPort>
     \endcode
 
     To link against the module, add this line to your \l qmake \c
diff --git a/src/serialport/doc/src/intro.qdoc b/src/serialport/doc/src/intro.qdoc
index b8d7145..dbb30e5 100644
--- a/src/serialport/doc/src/intro.qdoc
+++ b/src/serialport/doc/src/intro.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtAddonSerialPort
+    \module QtSerialPort
     \title Introduction
     \page intro.html
     \contentspage {Introduction} {Contents}
diff --git a/src/serialport/qt4support/install-helper.pri b/src/serialport/qt4support/install-helper.pri
index 7acc26c..179e5b2 100644
--- a/src/serialport/qt4support/install-helper.pri
+++ b/src/serialport/qt4support/install-helper.pri
@@ -1,18 +1,18 @@
-SERIALPORT_PROJECT_INCLUDEDIR = $$SERIALPORT_BUILD_ROOT/include/QtAddOnSerialPort
-SERIALPORT_PROJECT_INCLUDEDIR ~=s,/,$$QMAKE_DIR_SEP,
+QTSERIALPORT_PROJECT_INCLUDEDIR = $$QTSERIALPORT_BUILD_ROOT/include/QtSerialPort
+QTSERIALPORT_PROJECT_INCLUDEDIR ~=s,/,$$QMAKE_DIR_SEP,
 
-system("$$QMAKE_MKDIR $$SERIALPORT_PROJECT_INCLUDEDIR")
+system("$$QMAKE_MKDIR $$QTSERIALPORT_PROJECT_INCLUDEDIR")
 
 for(header_file, PUBLIC_HEADERS) {
    header_file ~=s,/,$$QMAKE_DIR_SEP,
-   system("$$QMAKE_COPY \"$${header_file}\" \"$$SERIALPORT_PROJECT_INCLUDEDIR\"")
+   system("$$QMAKE_COPY \"$${header_file}\" \"$$QTSERIALPORT_PROJECT_INCLUDEDIR\"")
 }
 
 target_headers.files  = $$PUBLIC_HEADERS
-target_headers.path   = $$[QT_INSTALL_PREFIX]/include/QtAddOnSerialPort
+target_headers.path   = $$[QT_INSTALL_PREFIX]/include/QtSerialPort
 INSTALLS              += target_headers
 
-mkspecs_features.files    = $$SERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf
+mkspecs_features.files    = $$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf
 mkspecs_features.path     = $$[QT_INSTALL_DATA]/mkspecs/features
 INSTALLS                  += mkspecs_features
 
diff --git a/src/serialport/qt4support/serialport.prf b/src/serialport/qt4support/serialport.prf
index 489acb5..c8bf5de 100644
--- a/src/serialport/qt4support/serialport.prf
+++ b/src/serialport/qt4support/serialport.prf
@@ -1,29 +1,26 @@
-!exists($$[QT_INSTALL_HEADERS]/QtAddOnSerialPort) {
-    INCLUDEPATH += $$SERIALPORT_BUILD_ROOT/include $$SERIALPORT_BUILD_ROOT/include/QtAddOnSerialPort
+!exists($$[QT_INSTALL_HEADERS]/QtSerialPort) {
+    INCLUDEPATH += $$QTSERIALPORT_BUILD_ROOT/include $$QTSERIALPORT_BUILD_ROOT/include/QtSerialPort
 
-    SERIALPORT_BUILD_SUBDIR = src/serialport
+    QTSERIALPORT_BUILD_SUBDIR = src/serialport
     win32 {
         CONFIG(debug, debug|release) {
-            SERIALPORT_BUILD_SUBDIR = $$SERIALPORT_BUILD_SUBDIR/debug
+            QTSERIALPORT_BUILD_SUBDIR = $$QTSERIALPORT_BUILD_SUBDIR/debug
         } else {
-            SERIALPORT_BUILD_SUBDIR = $$SERIALPORT_BUILD_SUBDIR/release
+            QTSERIALPORT_BUILD_SUBDIR = $$QTSERIALPORT_BUILD_SUBDIR/release
         }
     }
 
-    LIBS += -L$$SERIALPORT_BUILD_ROOT/$$SERIALPORT_BUILD_SUBDIR
+    LIBS += -L$$QTSERIALPORT_BUILD_ROOT/$$QTSERIALPORT_BUILD_SUBDIR
 }
 
-qtAddLibrary(SerialPort)
+qtAddLibrary(QtSerialPort)
 
 mac {
-    LIBS -= -framework SerialPort$${QT_LIBINFIX}
+    LIBS -= -framework QtSerialPort$${QT_LIBINFIX}
 
    if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
-       LIBS += -lSerialPort$${QT_LIBINFIX}_debug
+       LIBS += -lQtSerialPort$${QT_LIBINFIX}_debug
    } else {
-       LIBS += -lSerialPort$${QT_LIBINFIX}
+       LIBS += -lQtSerialPort$${QT_LIBINFIX}
    }
 }
-
-INCLUDEPATH -= $$[QT_INSTALL_HEADERS]/SerialPort
-INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtAddOnSerialPort
diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri
index 3d946c1..46ed058 100644
--- a/src/serialport/serialport-lib.pri
+++ b/src/serialport/serialport-lib.pri
@@ -38,7 +38,7 @@ symbian {
     TARGET.UID3 = 0xE7E62DFD
     TARGET.CAPABILITY =
     TARGET.EPOCALLOWDLLDATA = 1
-    addFiles.sources = SerialPort.dll
+    addFiles.sources = QtSerialPort.dll
     addFiles.path = !:/sys/bin
     DEPLOYMENT += addFiles
 
diff --git a/src/serialport/serialport.cpp b/src/serialport/serialport.cpp
index b168b08..7c12fea 100644
--- a/src/serialport/serialport.cpp
+++ b/src/serialport/serialport.cpp
@@ -94,7 +94,7 @@ int SerialPortPrivateData::timeoutValue(int msecs, int elapsed)
 
     \reentrant
     \ingroup serialport-main
-    \inmodule QtAddOnSerialPort
+    \inmodule QtSerialPort
     \since 5.0
 
     This class resembles the functionality and behavior of the QAbstractSocket
diff --git a/src/serialport/serialport.pro b/src/serialport/serialport.pro
index 52d480c..0046e12 100644
--- a/src/serialport/serialport.pro
+++ b/src/serialport/serialport.pro
@@ -8,11 +8,11 @@ include($$PWD/serialport-lib.pri)
 greaterThan(QT_MAJOR_VERSION, 4) {
     load(qt_build_config)
     QT += core-private
-    TARGET = QtAddOnSerialPort
+    TARGET = QtSerialPort
     load(qt_module)
 } else {
     TEMPLATE = lib
-    TARGET = $$qtLibraryTarget(SerialPort$$QT_LIBINFIX)
+    TARGET = $$qtLibraryTarget(QtSerialPort$$QT_LIBINFIX)
     include($$PWD/qt4support/install-helper.pri)
     CONFIG += module create_prl
     win32|mac:CONFIG += debug_and_release build_all
diff --git a/src/serialport/serialportinfo.cpp b/src/serialport/serialportinfo.cpp
index d47f204..9c4b964 100644
--- a/src/serialport/serialportinfo.cpp
+++ b/src/serialport/serialportinfo.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE_SERIALPORT
     existing serial ports.
 
     \ingroup serialport-main
-    \inmodule QtAddOnSerialPort
+    \inmodule QtSerialPort
     \since 5.0
 
     Use the static functions to generate a list of SerialPortInfo