Commit Graph

43 Commits

Author SHA1 Message Date
Jerome Pasion
f641bda2e7 Doc: Adding Qt Multimedia Widgets documentation.
-added landing page and module page
-linked to Qt Multimedia and Qt Widgets
-excluded multimediawidgets dir from the Qt Multimedia documentation

Task-number: QTBUG-29339
Change-Id: Iaa8dc4117505d5635b8cab97ed5c10e9c4a289e6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
2013-02-26 01:31:48 +01:00
Frederik Gladhorn
d396262bc9 Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	src/multimedia/doc/qtmultimedia.qdocconf
	src/plugins/blackberry/mediaplayer/bbmetadata.cpp
	src/plugins/blackberry/mediaplayer/bbmetadata.h
	tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp

Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
2013-02-19 17:15:56 +01:00
Tobias Koenig
01436abd3d Blackberry: Extend platform-specific documentation
Reflect camera support in Blackberry-specific documentation page.

Change-Id: I5267a32b99aa88cd73f33fe045d67579442f9932
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2013-02-19 14:45:44 +01:00
Topi Reinio
9ea9d57bbf Doc: Fix faulty snippet in Video Overview page
This change modifies setVideoSurface() in the snippet code
to be a bit more robust.

Task-number: QTBUG-29383

Change-Id: I2c691f19fe8f0912c1287597045da3a5579d2108
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2013-02-19 14:20:32 +01:00
Oswald Buddenhagen
99190404e1 fix doc page urls
they are versioned nowadays

Change-Id: I5c2ca367b8e63523811c03595cf8a7e326e8a662
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-06 09:45:31 +01:00
Oswald Buddenhagen
3f79f0707e substitute fixed version numbers in qdocconf files with variables
Change-Id: I20bd702b481d82903f5f4a42e74a8fb8ad4e71dc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-06 09:44:57 +01:00
Laszlo Papp
aa2dc1ab4b Add a simple accessor to the video provider snippet
Task-number: QTBUG-29383

Change-Id: I744fb997dae6ad1f9b8075791ad463c8fe23a96d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
2013-02-06 02:55:39 +01:00
Sergio Ahumada
c96d152e33 Merge branch 'release' into stable
Change-Id: If07e76a0f2f46d6dc50a41441324f02393e17d01
2013-01-29 15:21:05 +01:00
Sze Howe Koh
28ee5b12ff Doc: Fix module name format
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

QtMultimedia -> Qt Multimedia

(Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5)

Change-Id: I3c23435d5eceb946ea320756b835da937726db24
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-29 01:28:50 +01:00
Jerome Pasion
b01c8274fd Doc: Add QML Types to table of contents in Assistant
Replace 'headerfile' with 'qmlclass' in qdocconf file.

As a positive side-effect, QDoc will also add files for
'All members' for QML Types into .qhp as well.

Task-number: QTBUG-29226
Change-Id: I892f386cbd22bfbf7a04be5aecc800896e1090ec
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
2013-01-28 14:18:12 +01:00
Topi Reinio
52ad3219f0 QAudioInput/Output documentation: Fix slot naming in snippets
Having a code snippet use a slot (stateChanged) with a name
identical to a signal in QAudioInput / QAudioOutput classes causes
problems (incorrect links) in class documentation that refer to
the snippet code.

This change renames the slots according to standard Qt convention.
Same change is applied to example applications as well.

Task-number: QTBUG-26688
Change-Id: I0c6181240237d0c642b73fe18f3ddb5137b7f207
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-25 16:33:50 +01:00
Jerome Pasion
b671a5f688 Doc: Fixed "QML Types" listing C++ classes.
Removed "class" from the "selectors" qdocconf variable

Task-number: QTBUG-29242
Change-Id: I1d6c264a6a4277dff27bffcd39d9841363241f7d
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
2013-01-22 14:40:42 +01:00
Venugopal Shivashankar
8e6ffcc6af Doc: Fixed random QDoc warnings
- Fixed \snippet paths
- Minor language edits
- Removed unnecessary multiple page commands in a single comment
block. For example, \fn and \qmlsignal in a single comment block
is not allowed. Such instances must be documented in separate
comment blocks.

Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
(cherry picked from commit 51334d2995)
2013-01-17 16:03:48 +01:00
Frederik Gladhorn
f462bb9177 Bump Qt version to 5.1.0
Change-Id: I68f5c34fe14860c40537a23f28e741f0ac1eef1e
Reviewed-by: David Faure (KDE) <faure@kde.org>
2013-01-15 16:48:42 +01:00
Venugopal Shivashankar
51334d2995 Doc: Fixed random QDoc warnings
- Fixed \snippet paths
- Minor language edits
- Removed unnecessary multiple page commands in a single comment
block. For example, \fn and \qmlsignal in a single comment block
is not allowed. Such instances must be documented in separate
comment blocks.

Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-15 10:48:20 +01:00
Sergio Ahumada
c6b54f3521 doc: Fix namespace version to 5.0.1 for qhp documentation
Change-Id: Ie2d0aeff6d8b63ae9d18896320557d28cc9adb68
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-12 17:48:39 +01:00
Sergio Ahumada
399500f87e Update copyright year in Digia's license headers
Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-10 17:56:01 +01:00
Venugopal Shivashankar
85faa55780 Doc: Moved the qdocinc and image to the sourcedirs
QDoc parses the \input command relative to the sourcedirs
and not exampledirs. So I had to move the qdocinc file and
the corresponding image to the sourcedirs.

Task-number: QTBUG-28727
Change-Id: Ie064f0b79ab8ffcb0587b43ff4508f5865a321a9
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-02 15:28:47 +01:00
Sergio Ahumada
47b0d553d9 Bump Qt version to 5.0.1
Change-Id: Ic45b749ceea86263281b5c23509bf301fa334e5f
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-12-25 12:56:00 +01:00
Venugopal Shivashankar
3bf7a86c07 Doc: Fixed broken links to the Multimedia examples
- Updated the example links to reflect the new directory
structure for the multimedia examples.
- Removed a broken link to audiodecoder example
as it doesn't have a qdoc page yet.

Change-Id: Ia1169eeb80b4e6b6f92cd070aecbe72ce696bb6a
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-14 14:23:22 +01:00
Venugopal Shivashankar
0241b0e39c Doc: Updated the \example and \snippet paths
Also:
- Grouped the example docs under one group. i.e. multimedia-examples
- Moved the \group page here from the qtdoc repo
- Moved the snippets directory under doc from doc/src

Change-Id: I28fb81cf910e58101cd601fb4c440b59b0b0366d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-12 17:44:36 +01:00
Venugopal Shivashankar
1315dcf09c Doc: Added missing images and made some language edits
Change-Id: I9544121601c2c4099927e0e23550c3ab32bbfda9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-11-30 15:38:33 +01:00
Andy Nichols
e899ff8c5a Doc: cleanup multimedia overview
Added an introduction, and fix some formatting.

Change-Id: Ic23416cf1113895a1895a53f310530a83a9013d3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-11-28 09:16:10 +01:00
Andy Nichols
6f638d663c Doc: Cleanup diagram placeholder in Camera Overview
The diagram still needs to be done, but is not necessary for the 5.0
release.

Task-number: QTBUG-28235
Change-Id: I1e8b4d731c00516408de89be81d4ecb8bde3d016
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-11-27 15:56:31 +01:00
Sze Howe Koh
294fa9c5df Doc: Polish the description of changes to the Qt Multimedia module
- Fix errors
    - QtMultimediaKit is renamed to QMultimedia, not QtMultimedia
    - It's not necessary to explicitly convert metadata keys into
      strings -- Q_DECLARE_METADATA takes care of that
    - The introduction of MediaPlayer and VideoOutput does not affect
      existing code
- Follow module naming guidelines at
  http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
- Shorten descriptions, improve flow
- Remove trivia

Change-Id: I3ab9bb2f8f33cbea52b5993f3060d929a7e39ef1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-11-21 09:25:35 +01:00
Eskil Abrahamsen Blomfeldt
d00113c6ac Merge branch 'newdocs'
Change-Id: Ia45daee9b5089c01300cf27484296809dd87302f
2012-11-20 10:24:45 +01:00
Thomas McGuire
e567e098d9 Blackberry: Add a page with platform-specific documentation
Change-Id: Ic03c59523648ee25c419ec5d80122da9a717aa2d
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-11-07 23:20:45 +01:00
Jerome Pasion
e83d04557a Doc: Removed extra qdocconf files.
The variables and macros are in qtbase/doc/global.
Corrected QHP variables.

Change-Id: I4b5816d0d0ce7a228ed27944fb9471f390f7334d
Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-11-07 16:24:31 +01:00
Sze Howe Koh
832c3929f2 Rename namespace QtMultimedia -> QMultimedia
Main code, examples, tests and docs updated. Method:
1. Mass find+replace "QtMultimedia::" -> "QMultimedia::"
2. Hand-modified declaration in qtmedianamespace.h/cpp

For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-11-06 18:20:06 +01:00
Sze Howe Koh
00d7092163 Rename namespace QtMultimedia::MetaData -> QMediaMetaData
Main code, examples, tests and docs updated. Method:
1. Remove unused forward-declarations, "class QMediaMetaData"
2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData"
3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h

For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed. Also, Qt guidelines don't include nested namespaces
(http://lists.qt-project.org/pipermail/development/2012-October/006756.html)

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-11-06 18:19:57 +01:00
Jerome Pasion
a5947906d3 Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia into newdocs
Change-Id: Idb607da32f80784d94556443be6740c6d7223411
2012-11-02 15:41:00 +01:00
Venugopal Shivashankar
7f25187774 Doc: Removed dependency on qtmultimedia.css
All module documentation must use the global HTML template and style
sheet in qtbase\doc\global.

Change-Id: Ia7db9373f2291052924f433223a128ef4c2c3df8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-19 11:40:43 +02:00
Tor Arne Vestbø
962e99534d doc: update documentation project name to match module name
Otherwise qdoc will fail to find the index file when looking for
qtbase/doc/qtmodulename/qtmodulename.index.

Change-Id: I116b09350f157a42df6dbdb9d3029f4917f59299
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-12 16:17:40 +02:00
Tor Arne Vestbø
c64d7ce2a2 Update docs after modularization of docs
The global files now live in qtbase only, and are made available to the
other modules via the $QT_INSTALL_DOCS variable.

We now use QMAKE_DOCS to trigger doc generation instead of rolling our
own rules for qdoc.

Change-Id: I900029d71c305a1f269cddeeb0e05c524d933834
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-11 15:47:53 +02:00
Jerome Pasion
8005b89c65 Doc: Added Qt Multimedia to 'qmlmodules' group
-'qmlmodules' contains Qt's QML API
-made brief description consistent with other QML API

Change-Id: I30473048b06e2a4e13deb57c394a12c51a11693b
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-03 16:52:46 +02:00
Venugopal Shivashankar
06827f5d6e Doc: Organized related information in subsections
Change-Id: Iabe4a032d998003b659e298c3d602d68d83de8b1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-09-28 15:00:32 +02:00
Venugopal Shivashankar
43a00f366f Doc: Moved example documentation and images
Changed to adhere to the new documentation structure
outlined here:
http://qt-project.org/wiki/Qt_Documentation_Structure

Change-Id: I634e086c7d55abfac3680144cbbe97059fcbea4f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-09-26 17:47:43 +02:00
Iikka Eklund
dcbbad869e Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia

Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-24 09:05:51 +02:00
Venugopal Shivashankar
e06c037e10 Doc: Updated landing page to be consistent with other module landing pages
Change-Id: Ib230a7c01f2573b08f0a505fb0ada80d01757ba7
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-09-13 15:36:03 +02:00
Venugopal Shivashankar
f328a74153 Doc: Removed the unnecessary \annotatedlist command to avoid duplication
Change-Id: I5b1b42ed2b94735ff758e0e93e8df8eb5ab73a0f
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-09-12 17:59:01 +02:00
Venugopal Shivashankar
a4c23ac607 Doc: Added an index page and separated \qmlproperty and \property documentation
Change-Id: I29bcfd0a31c781deb4cce2d6bcb2afca32191ae6
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Reviewed-by: Martin Smith <martin.smith@nokia.com>
2012-08-29 13:17:52 +02:00
Venugopal Shivashankar
6ebee9f57e Fixed QDoc errors related to snippets and quotefromfile commands
Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-07-26 11:51:31 +02:00
Venugopal Shivashankar
f930e088fc Moved doc under src to fall in-line with the new modular structure
Change-Id: Ia2933baa1f0eaf82b5c2a626cb3661ee087049e3
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-07-25 15:00:59 +02:00