diff options
author | Laszlo Papp <lpapp@kde.org> | 2013-01-25 21:15:15 +0000 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2013-01-26 15:17:17 +0100 |
commit | 086698ce1ef923a45a784fa2f6b167185f7e740d (patch) | |
tree | 8b587a0946f30a32b52b19c252684911b40b0d6a | |
parent | 13e1bc161ce0359722eb81a3bebe24216d06dc93 (diff) | |
download | qtserialport-086698ce1ef923a45a784fa2f6b167185f7e740d.tar.gz |
Move the library and example documentations to the right places
Change-Id: Ia04d1f576b90ba705471b290b50f7adc2b13d00f
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r-- | examples/doc/blockingmaster.qdoc (renamed from doc/src/examples/blockingmaster.qdoc) | 0 | ||||
-rw-r--r-- | examples/doc/blockingslave.qdoc (renamed from doc/src/examples/blockingslave.qdoc) | 0 | ||||
-rw-r--r-- | examples/doc/cenumerator.qdoc (renamed from doc/src/examples/cenumerator.qdoc) | 0 | ||||
-rw-r--r-- | examples/doc/enumerator.qdoc (renamed from doc/src/examples/enumerator.qdoc) | 0 | ||||
-rw-r--r-- | examples/doc/terminal.qdoc (renamed from doc/src/examples/terminal.qdoc) | 0 | ||||
-rw-r--r-- | examples/examples.qdoc (renamed from doc/src/examples.qdoc) | 6 | ||||
-rw-r--r-- | qtserialport.pro | 2 | ||||
-rw-r--r-- | src/serialport/doc/doc.pri (renamed from doc/doc.pri) | 0 | ||||
-rw-r--r-- | src/serialport/doc/serialport.qdocconf (renamed from doc/serialport.qdocconf) | 2 | ||||
-rw-r--r-- | src/serialport/doc/src/build.qdoc (renamed from doc/src/build.qdoc) | 0 | ||||
-rw-r--r-- | src/serialport/doc/src/getsrc.qdoc (renamed from doc/src/getsrc.qdoc) | 0 | ||||
-rw-r--r-- | src/serialport/doc/src/images/cenumerator-example.png (renamed from doc/src/images/cenumerator-example.png) | bin | 3532 -> 3532 bytes | |||
-rw-r--r-- | src/serialport/doc/src/images/enumerator-example.png (renamed from doc/src/images/enumerator-example.png) | bin | 18510 -> 18510 bytes | |||
-rw-r--r-- | src/serialport/doc/src/images/terminal-example.png (renamed from doc/src/images/terminal-example.png) | bin | 10918 -> 10918 bytes | |||
-rw-r--r-- | src/serialport/doc/src/index.qdoc (renamed from doc/src/index.qdoc) | 0 | ||||
-rw-r--r-- | src/serialport/doc/src/intro.qdoc (renamed from doc/src/intro.qdoc) | 0 | ||||
-rw-r--r-- | src/serialport/doc/src/namespace.qdoc (renamed from doc/src/namespace.qdoc) | 0 | ||||
-rw-r--r-- | src/serialport/doc/style/style.css (renamed from doc/style/style.css) | 0 | ||||
-rw-r--r-- | src/serialport/serialport.pro | 1 |
19 files changed, 5 insertions, 6 deletions
diff --git a/doc/src/examples/blockingmaster.qdoc b/examples/doc/blockingmaster.qdoc index 8a0abfd..8a0abfd 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 810a8ef..810a8ef 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 60b229b..60b229b 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 c344d57..c344d57 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 78c12b1..78c12b1 100644 --- a/doc/src/examples/terminal.qdoc +++ b/examples/doc/terminal.qdoc diff --git a/doc/src/examples.qdoc b/examples/examples.qdoc index d4876ef..4ea0505 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 2d03c94..98e7303 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 a2097b7..a2097b7 100644 --- a/doc/doc.pri +++ b/src/serialport/doc/doc.pri diff --git a/doc/serialport.qdocconf b/src/serialport/doc/serialport.qdocconf index fc52c64..5c032d9 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 127dc53..127dc53 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 8fcab95..8fcab95 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 Binary files differindex 03792e7..03792e7 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 Binary files differindex c4add83..c4add83 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 Binary files differindex 28aa366..28aa366 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 e290804..e290804 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 b8d7145..b8d7145 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 2dfaeb6..2dfaeb6 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 df84049..df84049 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 0d1e13b..52d480c 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) { |