summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2016-12-163-4/+33
|\
| * qdoc: Define Q_COMPILER_UNICODE_STRINGSTopi Reinio2016-12-151-0/+1
| * qdoc: Ignore macro QT_WARNING_DISABLE_DEPRECATEDTopi Reinio2016-12-151-0/+1
| * Doc: Update the highlighted examples listVenugopal Shivashankar2016-12-141-4/+1
| * qdoc: Ignore Q_ALWAYS_INLINE and QT_HAS_INCLUDE()Topi Reinio2016-12-041-0/+2
| * Doc: Enable global linking to new Qt Creator VCS subtopicsLeena Miettinen2016-11-251-0/+28
* | Add Q_[ENUM|FLAG]_NS to global qt-cpp-defines doc confBogDan Vatra2016-12-141-0/+2
* | Doc: update Qt Widgets examplesNico Vertriest2016-12-1216-0/+0
|/
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-013-5/+23
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-313-4/+12
| |\
| | * Doc: CSS: Add styling for content generated with \legalese commandTopi Reinio2016-10-283-4/+12
| * | Doc: Template: Add CSS rules for bordered imagesTopi Reinio2016-10-282-1/+11
* | | Doc: Fix link to qsslkey-p11 example in external-resourcesLeena Miettinen2016-10-191-1/+1
* | | Change confusing Q_DEAD_CODE_FROM_QT4_FOO defineTor Arne Vestbø2016-10-141-1/+0
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-061-0/+7
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-011-0/+7
| |\|
| | * copy global qdoc config files in non-prefix shadow buildsOswald Buddenhagen2016-09-291-0/+7
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-291-0/+1
|\| |
| * | Doc: Add a custom \borderedimage macroTopi Reinio2016-09-231-0/+1
* | | Say hello to Q_NAMESPACEBogDan Vatra2016-08-191-0/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-0/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-0/+1
| |\|
| | * Doc: Change instances of '(Mac) OS X' to 'macOS'Topi Reinio2016-08-121-0/+1
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-101-3/+0
| |\|
| | * Remove hiding of .main div in offline pagesKai Koehne2016-08-051-3/+0
* | | Add \externalpage for The Qt CompanyKai Koehne2016-08-121-0/+4
* | | Automatically generate code attribution documentationKai Koehne2016-08-101-1/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-091-1/+1
|\| |
| * | Doc: Fix broken external link to livecoding vfx videoTopi Reinio2016-08-021-1/+1
* | | Remove hiding of .main div in offline pagesKai Koehne2016-08-031-3/+0
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-08-011-0/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-261-0/+1
| |\|
| | * Doc: Add a thumbnail for an example that has no UILeena Miettinen2016-07-201-0/+1
* | | Update qcssscanner so it can parse our normal offline documentation CSSAllan Sandfeld Jensen2016-07-261-1/+1
|/ /
* | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-041-1/+1
|\|
| * Fix URL to ANGLEFriedemann Kleint2016-06-301-1/+1
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-291-7/+3
|\|
| * Doc: Remove obsolete QtWebKit entries from the example metadataTopi Reinio2016-06-241-27/+3
* | Doc: Highlight Quick Controls 2 - Gallery exampleVenugopal Shivashankar2016-05-091-25/+1
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-071-15/+1
|\|
| * Doc: Simple offline CSS: Remove font-size declarationsTopi Reinio2016-04-051-15/+1
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-9/+9
| |\
* | | Unify license header usage.Jani Heikkinen2016-03-2931-131/+251
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-111-3/+1
|\| |
| * | Remove WebEngine examples metadataKai Koehne2016-03-071-3/+1
* | | Merge remote-tracking branch 'origin/5.6.0' into 5.7v5.7.0-alpha1Oswald Buddenhagen2016-03-071-9/+9
|\ \ \ | | |/ | |/|
| * | Doc: Simple CSS style: Convert font-sizes from px to ptTopi Reinio2016-02-231-9/+9
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-241-0/+4
|\ \ \ | | |/ | |/|
| * | Doc: Evaluate QT_VERSION >= QT_VERSION_CHECK(6,0,0) to falseTopi Reinio2016-02-221-0/+4
| |/
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-025-4/+5
|\|