19 files changed, 5 insertions, 6 deletions

diff --git a/doc/src/examples/blockingmaster.qdoc b/examples/doc/blockingmaster.qdoc
index 8a0abfdc..8a0abfdc 100644
--- a/doc/src/examples/blockingmaster.qdoc
+++ b/examples/doc/blockingmaster.qdoc
diff --git a/doc/src/examples/blockingslave.qdoc b/examples/doc/blockingslave.qdoc
index 810a8ef4..810a8ef4 100644
--- a/doc/src/examples/blockingslave.qdoc
+++ b/examples/doc/blockingslave.qdoc
diff --git a/doc/src/examples/cenumerator.qdoc b/examples/doc/cenumerator.qdoc
index 60b229b2..60b229b2 100644
--- a/doc/src/examples/cenumerator.qdoc
+++ b/examples/doc/cenumerator.qdoc
diff --git a/doc/src/examples/enumerator.qdoc b/examples/doc/enumerator.qdoc
index c344d579..c344d579 100644
--- a/doc/src/examples/enumerator.qdoc
+++ b/examples/doc/enumerator.qdoc
diff --git a/doc/src/examples/terminal.qdoc b/examples/doc/terminal.qdoc
index 78c12b11..78c12b11 100644
--- a/doc/src/examples/terminal.qdoc
+++ b/examples/doc/terminal.qdoc
diff --git a/doc/src/examples.qdoc b/examples/examples.qdoc
index d4876ef5..4ea0505d 100644
--- a/doc/src/examples.qdoc
+++ b/examples/examples.qdoc
@@ -34,8 +34,8 @@
     \contentspage {Examples} {Contents}
 
     \list
-    \o \l examples/cenumerator
-    \o \l examples/enumerator
-    \o \l examples/terminal
+    \o \l doc/cenumerator
+    \o \l doc/enumerator
+    \o \l doc/terminal
     \endlist
 */
diff --git a/qtserialport.pro b/qtserialport.pro
index 2d03c945..98e7303a 100644
--- a/qtserialport.pro
+++ b/qtserialport.pro
@@ -1,5 +1,3 @@
-include(doc/doc.pri)
-
 lessThan(QT_MAJOR_VERSION, 5) {
     TEMPLATE = subdirs
     SUBDIRS = src examples tests
diff --git a/doc/doc.pri b/src/serialport/doc/doc.pri
index a2097b7f..a2097b7f 100644
--- a/doc/doc.pri
+++ b/src/serialport/doc/doc.pri
diff --git a/doc/serialport.qdocconf b/src/serialport/doc/serialport.qdocconf
index fc52c644..5c032d97 100644
--- a/doc/serialport.qdocconf
+++ b/src/serialport/doc/serialport.qdocconf
@@ -1,7 +1,7 @@
 project     = SerialPort
 description = SerialPort Documentation
 
-exampledirs = ../examples ..
+exampledirs = ../../../examples ..
 headerdirs  = ./src ../src
 imagedirs   = ./src/images
 sourcedirs  = ./src ../src
diff --git a/doc/src/build.qdoc b/src/serialport/doc/src/build.qdoc
index 127dc536..127dc536 100644
--- a/doc/src/build.qdoc
+++ b/src/serialport/doc/src/build.qdoc
diff --git a/doc/src/getsrc.qdoc b/src/serialport/doc/src/getsrc.qdoc
index 8fcab959..8fcab959 100644
--- a/doc/src/getsrc.qdoc
+++ b/src/serialport/doc/src/getsrc.qdoc
diff --git a/doc/src/images/cenumerator-example.png b/src/serialport/doc/src/images/cenumerator-example.png
index 03792e71..03792e71 100644
--- a/doc/src/images/cenumerator-example.png
+++ b/src/serialport/doc/src/images/cenumerator-example.png
diff --git a/doc/src/images/enumerator-example.png b/src/serialport/doc/src/images/enumerator-example.png
index c4add838..c4add838 100644
--- a/doc/src/images/enumerator-example.png
+++ b/src/serialport/doc/src/images/enumerator-example.png
diff --git a/doc/src/images/terminal-example.png b/src/serialport/doc/src/images/terminal-example.png
index 28aa3667..28aa3667 100644
--- a/doc/src/images/terminal-example.png
+++ b/src/serialport/doc/src/images/terminal-example.png
diff --git a/doc/src/index.qdoc b/src/serialport/doc/src/index.qdoc
index e2908043..e2908043 100644
--- a/doc/src/index.qdoc
+++ b/src/serialport/doc/src/index.qdoc
diff --git a/doc/src/intro.qdoc b/src/serialport/doc/src/intro.qdoc
index b8d71457..b8d71457 100644
--- a/doc/src/intro.qdoc
+++ b/src/serialport/doc/src/intro.qdoc
diff --git a/doc/src/namespace.qdoc b/src/serialport/doc/src/namespace.qdoc
index 2dfaeb65..2dfaeb65 100644
--- a/doc/src/namespace.qdoc
+++ b/src/serialport/doc/src/namespace.qdoc
diff --git a/doc/style/style.css b/src/serialport/doc/style/style.css
index df84049f..df84049f 100644
--- a/doc/style/style.css
+++ b/src/serialport/doc/style/style.css
diff --git a/src/serialport/serialport.pro b/src/serialport/serialport.pro
index 0d1e13b6..52d480c4 100644
--- a/src/serialport/serialport.pro
+++ b/src/serialport/serialport.pro
@@ -2,6 +2,7 @@ QT = core
 DEFINES += QT_SERIALPORT_LIB
 VERSION = 0.1.0
 
+include($$PWD/doc/doc.pri)
 include($$PWD/serialport-lib.pri)
 
 greaterThan(QT_MAJOR_VERSION, 4) {