diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2013-09-24 14:26:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 12:39:20 +0200 |
| commit | ff3b658c771d8fbc17109ff5e0096ad1fe62f2e4 (patch) | |
| tree | 39900b5fabb1dc3e923ec0c48168d09557b28f96 /examples | |
| parent | 8312bc37499461375fc2ee7a3e1b1eb6df948370 (diff) | |
Doc: Create documentation structure for Qt Mac Extrasv5.2.0-alpha1
Create documentation structure for the module
- Module qdocconf
- Documentation pages for module index, namespace/classes,
examples (not much content yet)
Other doc-related changes
- Enable running 'make docs' on all platforms
- Move examples under examples/macextras for a clean
installing to QT_INSTALL_EXAMPLES
- Ensure documented classes use correct \inmodule and
\since commands
- Add \namespace QtMac
- Other minor fixes
Change-Id: I1376d68fcd7ab324a5d3355f1d15914092900e5b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 5 | ||||
| -rw-r--r-- | examples/macextras/embeddedqwindow/embeddedqwindow.pro (renamed from examples/embeddedqwindow/embeddedqwindow.pro) | 0 | ||||
| -rw-r--r-- | examples/macextras/embeddedqwindow/main.mm (renamed from examples/embeddedqwindow/main.mm) | 0 | ||||
| -rw-r--r-- | examples/macextras/embeddedqwindow/window.cpp (renamed from examples/embeddedqwindow/window.cpp) | 0 | ||||
| -rw-r--r-- | examples/macextras/embeddedqwindow/window.h (renamed from examples/embeddedqwindow/window.h) | 0 | ||||
| -rw-r--r-- | examples/macextras/macextras.pro | 5 | ||||
| -rw-r--r-- | examples/macextras/macfunctions/macfunctions.pro (renamed from examples/macfunctions/macfunctions.pro) | 0 | ||||
| -rw-r--r-- | examples/macextras/macfunctions/macfunctions.qrc (renamed from examples/macfunctions/macfunctions.qrc) | 0 | ||||
| -rw-r--r-- | examples/macextras/macfunctions/main.cpp (renamed from examples/macfunctions/main.cpp) | 0 | ||||
| -rw-r--r-- | examples/macextras/macfunctions/qtlogo.png (renamed from examples/macfunctions/qtlogo.png) | bin | 1478 -> 1478 bytes | |||
| -rw-r--r-- | examples/macextras/macpasteboardmime/macpasteboardmime.pro (renamed from examples/macpasteboardmime/macpasteboardmime.pro) | 0 | ||||
| -rw-r--r-- | examples/macextras/macpasteboardmime/main.cpp (renamed from examples/macpasteboardmime/main.cpp) | 0 |
12 files changed, 6 insertions, 4 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 8fe1d13..f23b00b 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,5 +1,2 @@ TEMPLATE = subdirs - -mac:SUBDIRS = macfunctions -mac:!ios:SUBDIRS += embeddedqwindow \ - macpasteboardmime +mac:SUBDIRS = macextras diff --git a/examples/embeddedqwindow/embeddedqwindow.pro b/examples/macextras/embeddedqwindow/embeddedqwindow.pro index 022a614..022a614 100644 --- a/examples/embeddedqwindow/embeddedqwindow.pro +++ b/examples/macextras/embeddedqwindow/embeddedqwindow.pro diff --git a/examples/embeddedqwindow/main.mm b/examples/macextras/embeddedqwindow/main.mm index f24533b..f24533b 100644 --- a/examples/embeddedqwindow/main.mm +++ b/examples/macextras/embeddedqwindow/main.mm diff --git a/examples/embeddedqwindow/window.cpp b/examples/macextras/embeddedqwindow/window.cpp index 1868591..1868591 100644 --- a/examples/embeddedqwindow/window.cpp +++ b/examples/macextras/embeddedqwindow/window.cpp diff --git a/examples/embeddedqwindow/window.h b/examples/macextras/embeddedqwindow/window.h index cdd6ebd..cdd6ebd 100644 --- a/examples/embeddedqwindow/window.h +++ b/examples/macextras/embeddedqwindow/window.h diff --git a/examples/macextras/macextras.pro b/examples/macextras/macextras.pro new file mode 100644 index 0000000..8fe1d13 --- /dev/null +++ b/examples/macextras/macextras.pro @@ -0,0 +1,5 @@ +TEMPLATE = subdirs + +mac:SUBDIRS = macfunctions +mac:!ios:SUBDIRS += embeddedqwindow \ + macpasteboardmime diff --git a/examples/macfunctions/macfunctions.pro b/examples/macextras/macfunctions/macfunctions.pro index 8d11880..8d11880 100644 --- a/examples/macfunctions/macfunctions.pro +++ b/examples/macextras/macfunctions/macfunctions.pro diff --git a/examples/macfunctions/macfunctions.qrc b/examples/macextras/macfunctions/macfunctions.qrc index 04a9419..04a9419 100644 --- a/examples/macfunctions/macfunctions.qrc +++ b/examples/macextras/macfunctions/macfunctions.qrc diff --git a/examples/macfunctions/main.cpp b/examples/macextras/macfunctions/main.cpp index a1563ba..a1563ba 100644 --- a/examples/macfunctions/main.cpp +++ b/examples/macextras/macfunctions/main.cpp diff --git a/examples/macfunctions/qtlogo.png b/examples/macextras/macfunctions/qtlogo.png Binary files differindex d75936b..d75936b 100644 --- a/examples/macfunctions/qtlogo.png +++ b/examples/macextras/macfunctions/qtlogo.png diff --git a/examples/macpasteboardmime/macpasteboardmime.pro b/examples/macextras/macpasteboardmime/macpasteboardmime.pro index 3ce4cd4..3ce4cd4 100644 --- a/examples/macpasteboardmime/macpasteboardmime.pro +++ b/examples/macextras/macpasteboardmime/macpasteboardmime.pro diff --git a/examples/macpasteboardmime/main.cpp b/examples/macextras/macpasteboardmime/main.cpp index 4d3063a..4d3063a 100644 --- a/examples/macpasteboardmime/main.cpp +++ b/examples/macextras/macpasteboardmime/main.cpp |
