summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-02-131-1/+6
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-291-1/+6
| |\
| | * Doc: Fix copy-paste error in QOpenGLTexture::Target docsLeena Miettinen2020-01-281-1/+6
* | | Regenerate rest of qtbaseAlexandru Croitor2020-02-041-0/+1
* | | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-247-41/+226
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-134-4/+4
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-01-094-4/+4
| | |\|
| | | * Bump copyright yearJani Heikkinen2020-01-094-4/+4
| * | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-01-041-36/+38
| |\| |
| | * | Update macros to work with DocBook supportThibaut Cuvelier2020-01-031-36/+38
| | |/
| * / Doc: Add porting guide Qt5 to Qt6 documentPaul Wicking2019-12-181-0/+54
| |/
| * Doc: Move the common documentation to a qdocincVenugopal Shivashankar2019-11-181-0/+129
* | Add custom targets for documentationLeander Beernaert2019-12-181-0/+7
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-191-0/+6
|\|
| * Doc: Prevent QDoc from auto-linking certain wordsv5.14.0-beta2Topi Reinio2019-10-191-0/+6
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-142-3/+49
|\|
| * Merge remote-tracking branch 'origin/5.13' into 5.14Friedemann Kleint2019-09-092-3/+49
| |\
| | * Doc: Add external links to new topics in Qt Creator ManualLeena Miettinen2019-09-051-2/+46
| | * Doc: Add doc/config directory to installed docsTopi Reinio2019-08-131-1/+3
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-111-0/+0
|\| |
| * | Remove dead code from Qt 4 timesTor Arne Vestbø2019-08-201-0/+0
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-1139-0/+39
|\| |
| * | Introduce Q_NAMESPACE_EXPORTGiuseppe D'Angelo2019-06-281-0/+1
| |/
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-05-0338-0/+38
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-034-6/+70
|\|
| * Merge remote-tracking branch 'origin/5.12' into 5.13Friedemann Kleint2019-05-271-0/+10
| |\
| | * Qt Widgets: Document CMake macrosKai Koehne2019-05-161-0/+5
| | * Qt Core: Document CMake macrosKai Koehne2019-05-161-0/+5
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-093-1/+56
| |\|
| | * Document how to use CMake on Qt Core, Qt GUI's central pagesKai Koehne2019-05-073-1/+56
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-261-6/+5
| |\|
| | * Update external links to CMake documentationKai Koehne2019-04-251-6/+5
* | | Merge commit 'dev' into 'wip/cmake-merge'Tobias Hunger2019-04-169-838/+802
|\| |
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-111-19/+0
| |\|
| | * Doc: Remove background colors from simplified offline CSSTopi Reinio2019-03-101-19/+0
| * | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-264-4/+4
| |\|
| | * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-01-234-4/+4
| | |\
| | | * Bump copyright year to 2019Kai Koehne2018-12-184-4/+4
| * | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-211-0/+1
| |\| |
| | * | Documentation: Add \nullptr macro and use where applicableFriedemann Kleint2019-01-101-0/+1
| | |/
| * | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-10-253-815/+797
| |\|
| | * doc: Update online navigation header to match http://doc.qt.io/Tor Arne Vestbø2018-10-171-51/+18
| | * doc: Update online CSSTor Arne Vestbø2018-10-163-762/+775
| | * doc: Update online HTML header URLsTor Arne Vestbø2018-10-161-3/+5
* | | CMake: Introduce Q_OBJECT qdoc macroTobias Hunger2019-01-251-0/+1
|/ /
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-291-0/+5
|\|
| * Doc: Add a macro that expands to the Qt version (Major.Minor)Topi Reinio2018-09-251-0/+1
| * Doc: Add a macro that returns the minor versionTopi Reinio2018-09-251-0/+4
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-2511-492/+0
|\|
| * Doc: Remove outdated and unmaintained examplesPaul Wicking2018-09-1711-492/+0