diff options
author | David Schulz <david.schulz@digia.com> | 2012-12-06 11:34:35 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-06 12:44:05 +0100 |
commit | 83a6416f9ded3b164a075d72ef1ac7adc1d2f340 (patch) | |
tree | d16bfb6dc02e08311bb21b8353009df145ac072d /examples | |
parent | 68d1384704afa8143f785c580f10f5d97528b0b7 (diff) |
QtTools: Doc: Moved assistant examples
... and changed exampledirs in the qdocconf files
to the appropriate modules.
Change-Id: Ic15d9fc845d59fb4e84ee39a52e457666fa09e51
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/assistant/assistant.pro | 4 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/assistant.cpp (renamed from examples/help/simpletextviewer/assistant.cpp) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/assistant.h (renamed from examples/help/simpletextviewer/assistant.h) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/doc/images/simpletextviewer-example.png (renamed from examples/help/simpletextviewer/doc/images/simpletextviewer-example.png) | bin | 63132 -> 63132 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/doc/images/simpletextviewer-findfiledialog.png (renamed from examples/help/simpletextviewer/doc/images/simpletextviewer-findfiledialog.png) | bin | 12421 -> 12421 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/doc/images/simpletextviewer-mainwindow.png (renamed from examples/help/simpletextviewer/doc/images/simpletextviewer-mainwindow.png) | bin | 14167 -> 14167 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/doc/src/simpletextviewer.qdoc (renamed from examples/help/simpletextviewer/doc/src/simpletextviewer.qdoc) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/about.txt (renamed from examples/help/simpletextviewer/documentation/about.txt) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/browse.html (renamed from examples/help/simpletextviewer/documentation/browse.html) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/filedialog.html (renamed from examples/help/simpletextviewer/documentation/filedialog.html) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/findfile.html (renamed from examples/help/simpletextviewer/documentation/findfile.html) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/images/browse.png (renamed from examples/help/simpletextviewer/documentation/images/browse.png) | bin | 21553 -> 21553 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/images/fadedfilemenu.png (renamed from examples/help/simpletextviewer/documentation/images/fadedfilemenu.png) | bin | 9589 -> 9589 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/images/filedialog.png (renamed from examples/help/simpletextviewer/documentation/images/filedialog.png) | bin | 12318 -> 12318 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/images/handbook.png (renamed from examples/help/simpletextviewer/documentation/images/handbook.png) | bin | 1060 -> 1060 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/images/icon.png (renamed from examples/help/simpletextviewer/documentation/images/icon.png) | bin | 5513 -> 5513 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/images/mainwindow.png (renamed from examples/help/simpletextviewer/documentation/images/mainwindow.png) | bin | 12769 -> 12769 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/images/open.png (renamed from examples/help/simpletextviewer/documentation/images/open.png) | bin | 11697 -> 11697 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/images/wildcard.png (renamed from examples/help/simpletextviewer/documentation/images/wildcard.png) | bin | 11266 -> 11266 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/index.html (renamed from examples/help/simpletextviewer/documentation/index.html) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/intro.html (renamed from examples/help/simpletextviewer/documentation/intro.html) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/openfile.html (renamed from examples/help/simpletextviewer/documentation/openfile.html) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/simpletextviewer.qch (renamed from examples/help/simpletextviewer/documentation/simpletextviewer.qch) | bin | 108544 -> 108544 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc (renamed from examples/help/simpletextviewer/documentation/simpletextviewer.qhc) | bin | 18432 -> 18432 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp (renamed from examples/help/simpletextviewer/documentation/simpletextviewer.qhcp) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp (renamed from examples/help/simpletextviewer/documentation/simpletextviewer.qhp) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/wildcardmatching.html (renamed from examples/help/simpletextviewer/documentation/wildcardmatching.html) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/findfiledialog.cpp (renamed from examples/help/simpletextviewer/findfiledialog.cpp) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/findfiledialog.h (renamed from examples/help/simpletextviewer/findfiledialog.h) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/main.cpp (renamed from examples/help/simpletextviewer/main.cpp) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/mainwindow.cpp (renamed from examples/help/simpletextviewer/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/mainwindow.h (renamed from examples/help/simpletextviewer/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/simpletextviewer.pro (renamed from examples/help/simpletextviewer/simpletextviewer.pro) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/textedit.cpp (renamed from examples/help/simpletextviewer/textedit.cpp) | 0 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/textedit.h (renamed from examples/help/simpletextviewer/textedit.h) | 0 | ||||
-rw-r--r-- | examples/examples.pro | 2 | ||||
-rw-r--r-- | examples/help/help.pro | 3 |
37 files changed, 6 insertions, 3 deletions
diff --git a/examples/assistant/assistant.pro b/examples/assistant/assistant.pro new file mode 100644 index 000000000..fd289a670 --- /dev/null +++ b/examples/assistant/assistant.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs +CONFIG += ordered + +SUBDIRS += simpletextviewer diff --git a/examples/help/simpletextviewer/assistant.cpp b/examples/assistant/simpletextviewer/assistant.cpp index e8b81de67..e8b81de67 100644 --- a/examples/help/simpletextviewer/assistant.cpp +++ b/examples/assistant/simpletextviewer/assistant.cpp diff --git a/examples/help/simpletextviewer/assistant.h b/examples/assistant/simpletextviewer/assistant.h index 02728e7bd..02728e7bd 100644 --- a/examples/help/simpletextviewer/assistant.h +++ b/examples/assistant/simpletextviewer/assistant.h diff --git a/examples/help/simpletextviewer/doc/images/simpletextviewer-example.png b/examples/assistant/simpletextviewer/doc/images/simpletextviewer-example.png Binary files differindex 95d290539..95d290539 100644 --- a/examples/help/simpletextviewer/doc/images/simpletextviewer-example.png +++ b/examples/assistant/simpletextviewer/doc/images/simpletextviewer-example.png diff --git a/examples/help/simpletextviewer/doc/images/simpletextviewer-findfiledialog.png b/examples/assistant/simpletextviewer/doc/images/simpletextviewer-findfiledialog.png Binary files differindex f6e55f099..f6e55f099 100644 --- a/examples/help/simpletextviewer/doc/images/simpletextviewer-findfiledialog.png +++ b/examples/assistant/simpletextviewer/doc/images/simpletextviewer-findfiledialog.png diff --git a/examples/help/simpletextviewer/doc/images/simpletextviewer-mainwindow.png b/examples/assistant/simpletextviewer/doc/images/simpletextviewer-mainwindow.png Binary files differindex 98c1c61cc..98c1c61cc 100644 --- a/examples/help/simpletextviewer/doc/images/simpletextviewer-mainwindow.png +++ b/examples/assistant/simpletextviewer/doc/images/simpletextviewer-mainwindow.png diff --git a/examples/help/simpletextviewer/doc/src/simpletextviewer.qdoc b/examples/assistant/simpletextviewer/doc/src/simpletextviewer.qdoc index dd8904721..dd8904721 100644 --- a/examples/help/simpletextviewer/doc/src/simpletextviewer.qdoc +++ b/examples/assistant/simpletextviewer/doc/src/simpletextviewer.qdoc diff --git a/examples/help/simpletextviewer/documentation/about.txt b/examples/assistant/simpletextviewer/documentation/about.txt index eeab35f4a..eeab35f4a 100644 --- a/examples/help/simpletextviewer/documentation/about.txt +++ b/examples/assistant/simpletextviewer/documentation/about.txt diff --git a/examples/help/simpletextviewer/documentation/browse.html b/examples/assistant/simpletextviewer/documentation/browse.html index 987abf31f..987abf31f 100644 --- a/examples/help/simpletextviewer/documentation/browse.html +++ b/examples/assistant/simpletextviewer/documentation/browse.html diff --git a/examples/help/simpletextviewer/documentation/filedialog.html b/examples/assistant/simpletextviewer/documentation/filedialog.html index afa65ed57..afa65ed57 100644 --- a/examples/help/simpletextviewer/documentation/filedialog.html +++ b/examples/assistant/simpletextviewer/documentation/filedialog.html diff --git a/examples/help/simpletextviewer/documentation/findfile.html b/examples/assistant/simpletextviewer/documentation/findfile.html index 32e014718..32e014718 100644 --- a/examples/help/simpletextviewer/documentation/findfile.html +++ b/examples/assistant/simpletextviewer/documentation/findfile.html diff --git a/examples/help/simpletextviewer/documentation/images/browse.png b/examples/assistant/simpletextviewer/documentation/images/browse.png Binary files differindex 86db6b19e..86db6b19e 100644 --- a/examples/help/simpletextviewer/documentation/images/browse.png +++ b/examples/assistant/simpletextviewer/documentation/images/browse.png diff --git a/examples/help/simpletextviewer/documentation/images/fadedfilemenu.png b/examples/assistant/simpletextviewer/documentation/images/fadedfilemenu.png Binary files differindex fde0e43f6..fde0e43f6 100644 --- a/examples/help/simpletextviewer/documentation/images/fadedfilemenu.png +++ b/examples/assistant/simpletextviewer/documentation/images/fadedfilemenu.png diff --git a/examples/help/simpletextviewer/documentation/images/filedialog.png b/examples/assistant/simpletextviewer/documentation/images/filedialog.png Binary files differindex 883a33a26..883a33a26 100644 --- a/examples/help/simpletextviewer/documentation/images/filedialog.png +++ b/examples/assistant/simpletextviewer/documentation/images/filedialog.png diff --git a/examples/help/simpletextviewer/documentation/images/handbook.png b/examples/assistant/simpletextviewer/documentation/images/handbook.png Binary files differindex 3bd2b928b..3bd2b928b 100644 --- a/examples/help/simpletextviewer/documentation/images/handbook.png +++ b/examples/assistant/simpletextviewer/documentation/images/handbook.png diff --git a/examples/help/simpletextviewer/documentation/images/icon.png b/examples/assistant/simpletextviewer/documentation/images/icon.png Binary files differindex 6daec0ade..6daec0ade 100644 --- a/examples/help/simpletextviewer/documentation/images/icon.png +++ b/examples/assistant/simpletextviewer/documentation/images/icon.png diff --git a/examples/help/simpletextviewer/documentation/images/mainwindow.png b/examples/assistant/simpletextviewer/documentation/images/mainwindow.png Binary files differindex c28d5e9ff..c28d5e9ff 100644 --- a/examples/help/simpletextviewer/documentation/images/mainwindow.png +++ b/examples/assistant/simpletextviewer/documentation/images/mainwindow.png diff --git a/examples/help/simpletextviewer/documentation/images/open.png b/examples/assistant/simpletextviewer/documentation/images/open.png Binary files differindex 1e5bba3c8..1e5bba3c8 100644 --- a/examples/help/simpletextviewer/documentation/images/open.png +++ b/examples/assistant/simpletextviewer/documentation/images/open.png diff --git a/examples/help/simpletextviewer/documentation/images/wildcard.png b/examples/assistant/simpletextviewer/documentation/images/wildcard.png Binary files differindex 6e83a56cc..6e83a56cc 100644 --- a/examples/help/simpletextviewer/documentation/images/wildcard.png +++ b/examples/assistant/simpletextviewer/documentation/images/wildcard.png diff --git a/examples/help/simpletextviewer/documentation/index.html b/examples/assistant/simpletextviewer/documentation/index.html index 5a7b1d5fa..5a7b1d5fa 100644 --- a/examples/help/simpletextviewer/documentation/index.html +++ b/examples/assistant/simpletextviewer/documentation/index.html diff --git a/examples/help/simpletextviewer/documentation/intro.html b/examples/assistant/simpletextviewer/documentation/intro.html index 2e2aa40de..2e2aa40de 100644 --- a/examples/help/simpletextviewer/documentation/intro.html +++ b/examples/assistant/simpletextviewer/documentation/intro.html diff --git a/examples/help/simpletextviewer/documentation/openfile.html b/examples/assistant/simpletextviewer/documentation/openfile.html index e172de95e..e172de95e 100644 --- a/examples/help/simpletextviewer/documentation/openfile.html +++ b/examples/assistant/simpletextviewer/documentation/openfile.html diff --git a/examples/help/simpletextviewer/documentation/simpletextviewer.qch b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch Binary files differindex c40132803..c40132803 100644 --- a/examples/help/simpletextviewer/documentation/simpletextviewer.qch +++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch diff --git a/examples/help/simpletextviewer/documentation/simpletextviewer.qhc b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc Binary files differindex db380cabf..db380cabf 100644 --- a/examples/help/simpletextviewer/documentation/simpletextviewer.qhc +++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc diff --git a/examples/help/simpletextviewer/documentation/simpletextviewer.qhcp b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp index e7c23210b..e7c23210b 100644 --- a/examples/help/simpletextviewer/documentation/simpletextviewer.qhcp +++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp diff --git a/examples/help/simpletextviewer/documentation/simpletextviewer.qhp b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp index 4cb83a5f3..4cb83a5f3 100644 --- a/examples/help/simpletextviewer/documentation/simpletextviewer.qhp +++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp diff --git a/examples/help/simpletextviewer/documentation/wildcardmatching.html b/examples/assistant/simpletextviewer/documentation/wildcardmatching.html index eb1839a06..eb1839a06 100644 --- a/examples/help/simpletextviewer/documentation/wildcardmatching.html +++ b/examples/assistant/simpletextviewer/documentation/wildcardmatching.html diff --git a/examples/help/simpletextviewer/findfiledialog.cpp b/examples/assistant/simpletextviewer/findfiledialog.cpp index 66b2d8282..66b2d8282 100644 --- a/examples/help/simpletextviewer/findfiledialog.cpp +++ b/examples/assistant/simpletextviewer/findfiledialog.cpp diff --git a/examples/help/simpletextviewer/findfiledialog.h b/examples/assistant/simpletextviewer/findfiledialog.h index e0212c263..e0212c263 100644 --- a/examples/help/simpletextviewer/findfiledialog.h +++ b/examples/assistant/simpletextviewer/findfiledialog.h diff --git a/examples/help/simpletextviewer/main.cpp b/examples/assistant/simpletextviewer/main.cpp index 9ef1b3f58..9ef1b3f58 100644 --- a/examples/help/simpletextviewer/main.cpp +++ b/examples/assistant/simpletextviewer/main.cpp diff --git a/examples/help/simpletextviewer/mainwindow.cpp b/examples/assistant/simpletextviewer/mainwindow.cpp index 447a76446..447a76446 100644 --- a/examples/help/simpletextviewer/mainwindow.cpp +++ b/examples/assistant/simpletextviewer/mainwindow.cpp diff --git a/examples/help/simpletextviewer/mainwindow.h b/examples/assistant/simpletextviewer/mainwindow.h index 962680eb4..962680eb4 100644 --- a/examples/help/simpletextviewer/mainwindow.h +++ b/examples/assistant/simpletextviewer/mainwindow.h diff --git a/examples/help/simpletextviewer/simpletextviewer.pro b/examples/assistant/simpletextviewer/simpletextviewer.pro index 2b0a1ace6..2b0a1ace6 100644 --- a/examples/help/simpletextviewer/simpletextviewer.pro +++ b/examples/assistant/simpletextviewer/simpletextviewer.pro diff --git a/examples/help/simpletextviewer/textedit.cpp b/examples/assistant/simpletextviewer/textedit.cpp index 05b6d1095..05b6d1095 100644 --- a/examples/help/simpletextviewer/textedit.cpp +++ b/examples/assistant/simpletextviewer/textedit.cpp diff --git a/examples/help/simpletextviewer/textedit.h b/examples/assistant/simpletextviewer/textedit.h index e24e689a1..e24e689a1 100644 --- a/examples/help/simpletextviewer/textedit.h +++ b/examples/assistant/simpletextviewer/textedit.h diff --git a/examples/examples.pro b/examples/examples.pro index 3f5f71a04..cacdec563 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -!isEmpty(QT.widgets.name): SUBDIRS += help designer linguist uitools +!isEmpty(QT.widgets.name): SUBDIRS += help designer linguist uitools assistant diff --git a/examples/help/help.pro b/examples/help/help.pro index 5a4eb2a35..c98aad8a9 100644 --- a/examples/help/help.pro +++ b/examples/help/help.pro @@ -2,5 +2,4 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += contextsensitivehelp \ - remotecontrol \ - simpletextviewer + remotecontrol |