summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Move generic code sample image and add it to qhpold/5.1Topi Reinio2013-09-173-0/+4
| | | | | | | | | | | | | In order to add extra images to a qhp file, we need to both add it to output directory using HTML.extraimages, and from there to qhp using qhp.QtDoc.extraFiles. Also move the image to a better location and resize it to look better in Qt Creator. Task-number: QTBUG-31314 Change-Id: I817c9bb0e464b1f05430b4191b3bea21961ea122 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Add an image for a generic code sampleTopi Reinio2013-09-111-0/+0
| | | | | | | | | This image is to be used as a thumbnail in example manifest files (used by Qt Creator) for examples that do not include any images in their documentation. Change-Id: I758e61579c99a5d890438e0e7dc4778d08113288 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix extraction of CMake example code.Stephen Kelly2013-08-271-1/+1
| | | | | | | Use the correct location snippet. Change-Id: Id561f79f8212f75c06a2bbe854f49c00b349c980 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Link to JSON Save Game Example from Data Storage.Mitch Curtis2013-08-231-0/+1
| | | | | Change-Id: I89433e7cca9dac7d8a11e5db13c5aa3c923dc897 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-158-155/+36
|\ | | | | | | Change-Id: I1c044b5212420ee140e33ebcda2924881156dda3
| * Updated windows ce documentationv5.1.1Bjoern Breitmeyer2013-08-146-148/+32
| | | | | | | | | | Change-Id: Ic4a6779689c9dd567611ef01b1ac64cf177636e6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Polished "Glossary of QML Terms" pageJerome Pasion2013-08-142-6/+3
| | | | | | | | | | | | | | | | -removed extra section -changed the title of page Change-Id: I3e3f32ebe846ba453907334b284d3076df5db289 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Doc: Fixed link to BlackBerry documentation.Jerome Pasion2013-08-141-1/+1
| | | | | | | | | | | | | | Link in qtbase/doc/global points to qt-project.org/wiki/BlackBerry Change-Id: I73986af5b8edc96975d8fd1d3f299fd56f5f5b3c Reviewed-by: Martin Smith <martin.smith@digia.com>
* | QDesktopServices porting notes: fix copy/paste error and add link.David Faure2013-08-141-1/+2
| | | | | | | | | | | | | | Change-Id: I593d0527b0db4785b5645f6fb9d599bfbaceec64 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-093-302/+340
|\| | | | | | | Change-Id: I8d801d3e4e9e1cd110786cfc23b955b21a732029
| * Doc: Enabled cross-linking to "qmake Manual".Jerome Pasion2013-08-091-0/+1
| | | | | | | | | | | | | | Added "qmake" to depends variable Change-Id: I5c472faaabaf0900629641c9cec8df47fd09df8a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Doc: Mention Qt Quick Dialogs in getting started tutorialTopi Reinio2013-08-081-1/+4
| | | | | | | | | | | | | | | | | | | | As the Qt Quick Getting Started tutorial implements its own file dialog, add a note about what we currently provide in Qt Quick Dialogs to avoid confusion. Change-Id: I916729a7e8561c3093ca761b10b944ae47deb90b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Doc: Update QML Getting Started tutorialTopi Reinio2013-08-061-289/+318
| | | | | | | | | | | | | | | | | | | | | | | | This change addresses issues with the QML getting started tutorial: - Fix and clean up code snippets - Update to discuss QML modules - Fix linking, language issues and typos Change-Id: Idb8bc6be9b1dd5b302bea3eb78154553b10b66df Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Doc: Updated information about application development on MacVenu2013-08-021-12/+17
| | | | | | | | | | | | | | | | | | | | Summarized the application development story and removed some unnecessary details about the qmake options and their purpose. Task-number: QTBUG-32192 Change-Id: Iac13961a9d8fc66c15276a552d346c5e259ecd4d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: fix section title capitalization in debugging.qdocLeena Miettinen2013-08-091-1/+1
| | | | | | | | | | Change-Id: Ia966e5b2046cb0c3f6b63c356be5700506c13704 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: attaching debugger to running applicationsLeena Miettinen2013-08-081-5/+62
| | | | | | | | | | | | | | Added information to the Debugging QML Applications section. Change-Id: I316ddf7ac3760fea5f452a541dec2caa01675bf2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Document qt5_use_modules as obsolete.Stephen Kelly2013-07-291-0/+1
| | | | | | | | | | | | | | | | | | Partial forward-port of cb7f32f5b861fe115fa71f64500a5cbb0b643f1b (Mark qt4_use_modules and qt4_automoc as obsolete., 2013-07-04) from cmake.git. Change-Id: I6eb4d1056208e1bfe67f571b6019129a3a201305 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | CMake: Fix typos.Stephen Kelly2013-07-291-2/+2
| | | | | | | | | | | | | | | | Forward port of bf019d765d3993ba265c990a6e3a2e53defe112c (Fix spelling and typos (non-binary), 2012-11-07) from cmake.git. Change-Id: I0138bd718acb6029cf165b90c5f6a55241810572 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-263-5/+33
|\| | | | | | | Change-Id: I316359874afb67c824980d627527adbe57b2f10d
| * Document the deprecation of setRoleNamesLaszlo Papp2013-07-241-0/+2
| | | | | | | | | | | | | | | | | | | | The API was deprecated in qtbase to make the QAbstractItemModel API more consistent. Hence, it is now being put in the porting guide to simplify the effort for the Qt users. Task-number: QTBUG-31684 Change-Id: I9350f7752accd90b8fcc9f2a6d53554e3a1e3dd2 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Doc: Replace 'Learn More' subsections with bolded textTopi Reinio2013-07-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Getting Started Programming with Qt Widgets has multiple subsections titled 'Learn More'. They appear in TOC but do link to correct sections. This change fixes the issue by replacing these sections with bolded text so they are not listed in TOC. Task-number: QTBUG-32110 Change-Id: I4fbabcc18dc15737f5a155c742a82cefe57ba17d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Document changes to Qt::HANDLE in C++ API Changes pageTopi Reinio2013-07-241-0/+1
| | | | | | | | | | | | | | | | Qt::HANDLE is always defined as 'void *' on Qt 5.0 Task-number: QTBUG-32469 Change-Id: I945e436dec45a31a99d04b1221e9dad1fbd10476 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Add changes-5.1.1 fileSergio Ahumada2013-07-231-0/+25
| | | | | | | | | | Change-Id: I6812e032b566ecd53459dfde394058e198119e9f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Link to deployment of translations.Friedemann Kleint2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | Link to new documentation introduced by f90e3914ba99762f1a8498bc52e3afc1922cec9e (qttools). Task-number: QTBUG-28766 Change-Id: I7f56bd6ae5ed6980bfc4e43ad65ed208c44a9cdc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
|/ | | | | Change-Id: I00ee56fa10da4c56da1d8dc3102341f2a4d92fd6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Added "All QML Types" and "Obsolete QML Types" pages.Jerome Pasion2013-07-092-1/+43
| | | | | | | | -used the same style and wording as the C++ pages. Task-number: QTBUG-31490 Change-Id: I429863170de0a66ba5a5d5fed7f0bd67087f7cb6 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Updated the C++ API changes list with QMotifStyle informationVenu2013-07-041-0/+7
| | | | | | | | Task-number: QTBUG-31997 Change-Id: Iabe9f8f2d84a619031ff6bb3a846808419b36473 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Hide license from "Getting Started" snippetsSze Howe Koh2013-07-016-5/+15
| | | | | | | | | | | | | There's no point showing 5 copies of the license text on 1 page. It just adds noise with no benefit to the reader. Furthermore, a few of these snippets are described in the tutorial as being auto-generated by the Qt Creator wizard; the wizard would not generate the license text. Change-Id: Ifddd1238eb815ce86db7ebb0dabab08f5b547dbc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: (WS only) Fix misaligned snippet indentsSze Howe Koh2013-07-011-21/+21
| | | | | Change-Id: I49b62829faac15fc3eae46e9d0f00b0152f51984 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-281-0/+13
|\ | | | | | | Change-Id: Iaec8f6512f8e63ec3e9176a8025f8ffc42bea462
| * Doc: Added information about the ADB driver requirement on Windowsv5.1.0-rc2v5.1.0Venu2013-06-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | The default USB drivers on Windows does not allow USB debugging so the developers must install the ADB driver to test and debug their application on the Android device. Task-number: QTBUG-30173 Change-Id: I16ba4935b4b8dfda86584b3e8d15fa10b18e9a57 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
| * Doc: Added information about the tagged desktop examplesVenu2013-06-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | This change informs developers about listing the examples that are tested for Android so that they don't annoy themselves by trying to run examples that don't work. Task-number: QTBUG-30173 Change-Id: I0c422ebf265247c96e63c22fc4a76f28eb37a7d3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-252-6/+6
|\| | | | | | | Change-Id: I287ee9bfc79feacd670b4bc33cc26a8dfe0319ce
| * Doc:Updated information about tested platforms.Jerome Pasion2013-06-242-6/+6
| | | | | | | | | | | | | | | | | | -Adding Ubuntu 11.10 32-bit as a tested platform. -Updated Windows 7 and 8 compiler versions -Updated link to MinGW download Change-Id: If2acc11f044ad4623cb035eaefae9ba370f5c5a6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-202-0/+6
|\| | | | | | | Change-Id: Id43c65ddae90933db7a5a5203b4110d6939529d5
| * Doc: Added a link to Qt Quick Controls OverviewJerome Pasion2013-06-171-0/+4
| | | | | | | | | | | | | | Link facilitates the flow of information. Change-Id: If84226455c35460ad226f074f9b3177eac8363e3 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Document the deprecation of WFlagsLaszlo Papp2013-06-161-0/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-31737 Change-Id: I95dab7b174438b27e6fd555f88bca78099656d0c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | qmake doc moved to qtbaseOswald Buddenhagen2013-06-1836-6198/+0
| | | | | | | | | | | | | | Change-Id: Ic6a38c9e5acf3d5c35032bf7e6cbc805079e5399 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-1236-441/+418
|\| | | | | | | Change-Id: I25cc44a432143e1b3270594c5f74ecb532783376
| * Doc: Do not parse snippets as documentation sourcev5.1.0-rc1Topi Reinio2013-06-1229-351/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | The .qdocconf file was using the root of the repository as a source directory, leading to also the snippets being parsed as source for docs. This change modifies .qdocconf to remove the unnecessary paths and excludes src/snippets. It also fixes the \snippet links to be relative to src/ instead of the root folder. Change-Id: Ifd03d7f5f28360bbe89b250fc4567a81ab3a008d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Added a \note about the JAVA_HOME variableVenu2013-06-101-0/+4
| | | | | | | | | | | | | | | | | | | | Without this variable set to the JDK install dir, Qt Creator cannot find the Java binaries required to build the application. Task-number: QTBUG-30173 Change-Id: Id839b6ddc3c60dd09f29a8b47a77a9d147145b3a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Doc: Cleaned up the supported platforms sectionVenu2013-06-063-43/+8
| | | | | | | | | | | | | | | | | | | | | | - Removed the compiler notes page as it was only pointing to the supported platforms page. - Added links to pages providing information about the Mac OS X developer environment and platform notes. Task-number: QTBUG-30173 Change-Id: Ic2ac5365055858240a77fe3235243e4e8a584c78 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Updated the external link to the OpenJDK web siteVenu2013-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The earlier link was pointing to the OpenJDK download page for linux distributions only. The new one links to the OpenJDK generic page which talks about the JDK versions for other platforms as well. Task-number: QTBUG-30173 Change-Id: I5fef543e79c2e5c9b3eb86b2e9ad8169b80a4ab0 Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Minor language edits and broken link fixesVenu2013-06-042-26/+32
| | | | | | | | | | | | | | Task-number: QTBUG-30173 Change-Id: I56e4611b33856cbb075b0710917a1687239259a2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Update Qt Quick Controls descriptionCaroline Chao2013-06-041-3/+1
| | | | | | | | | | Change-Id: Idd056eea674a96236656c452e7a1df5e8e20f0fd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Enabling cross linking to Qt Quick Controls StylesCaroline Chao2013-06-041-0/+1
| | | | | | | | | | Change-Id: Id4e70590d4d0d15bd6494b2f0063e4d5e8525724 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Enabling cross linking to Qt Quick DialogsJerome Pasion2013-06-031-0/+1
| | | | | | | | | | Change-Id: Ia5d0243b8086d5cd12c4d459de1676b8af1edfc6 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Make performance guide slightly more accurateGunnar Sletta2013-05-311-17/+18
| | | | | | | | | | Change-Id: I5c7416d4e4a67f8c4c8490109876ae45be59652f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-05-315-12/+18
|\| | | | | | | Change-Id: I527ec7be5ddc361ed9667bcd6e5a388d5c18262a
| * Change "Item Layouts" to "Item Positioners"Jan Arve Saether2013-05-291-4/+6
| | | | | | | | | | | | | | | | | | | | This is because the title was changed in qtdeclarative. Also add a line with link to Qt Quick Layouts Change-Id: I044e53ae9c2cde39bd2b224caaf47017dff3455a Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>