summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Update dependenciesFriedemann Kleint2020-03-2610-7/+15
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-071-2/+2
|\
| * abstractdeclarative.cpp: Fix deprecation warningsFriedemann Kleint2020-01-021-2/+2
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-302-15/+8
|\|
| * Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-262-15/+8
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-121-1/+277
|\|
| * Update plugins.qmltypes for 5.14v5.14.0-beta2v5.14.0-beta1Kai Koehne2019-09-301-1/+277
* | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-041-1/+3
|\ \ | |/ |/|
| * Fix Qt6 buildAlexandru Croitor2019-08-071-1/+3
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-241-1/+1
|\ \
| * | Fix GCC 4.8 build of abstract3drendererVille Voutilainen2019-08-221-1/+1
* | | Remove the usage of deprecated QWheelEvent::posSona Kurazyan2019-08-231-1/+1
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|\| | | |/ |/|
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
* | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-121-2/+2
* | Fix deprecation warnings about QString::sprintf()Friedemann Kleint2019-05-271-3/+3
|/
* Fix hanging at application exitTomi Korpipaa2019-04-298-60/+48
* Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-211-2/+2
* Fix QML import versionTomi Korpipaa2019-03-144-3/+7
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-251-0/+1
|\
| * Register revision 1 of Q3DSceneUlf Hermann2019-02-251-0/+1
* | Fix deprecation warningsFriedemann Kleint2019-02-112-3/+3
|/
* Fix mesa checkJoni Poikelin2019-01-221-1/+1
* Doc: Fix \code command usageTopi Reinio2018-10-251-12/+15
* Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3v5.12.0-beta2Qt Forward Merge Bot2018-09-291-0/+1
|\
| * Do show module license on all help pagesKai Koehne2018-09-271-0/+1
* | Update plugins.qmltypesv5.12.0-beta1Kai Koehne2018-09-272-433/+4
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-049-99/+81
|\|
| * Use FDL license for all .qdoc filesKai Koehne2018-05-309-99/+81
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+6
|\|
| * Doc: Add license information to index pageKai Koehne2018-05-091-0/+6
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
* | Remove Qt<5.12 workaroundOlivier Goffart2018-04-101-2/+0
* | Use Qt::Alignment instead of the AlignmentFlag enum to represent flagsOlivier Goffart2018-04-105-9/+11
|/
* Fix wrong license headerv5.11.0-rc2v5.11.0-rc1v5.11.0-beta4v5.11.0-beta3v5.11.0Jani Heikkinen2018-03-281-10/+21
* Remove QDoc-related typedef hacksv5.11.0-beta2Topi Reinio2018-03-086-22/+13
* Fix documentation build when using Clang-enabled QDocTopi Reinio2018-03-081-0/+5
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-3/+10
|\
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-185-3/+10
| |\
| | * Fix mixing of vec3 and vec2 for coords_mdlMika Salmela2017-12-212-2/+1
| | * Render custom items at insertion orderMika Salmela2017-11-163-1/+9
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-202-3/+8
|\| |
| * | Doc: Update the list of highlighted examplesTopi Reinio2017-11-091-1/+1
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-2/+6
| |\|
| | * Set clamp to edge wrap modes for surface texturesMika Salmela2017-09-051-2/+6
| * | Doc: Update the highlighted examples listv5.10.0-beta2Venugopal Shivashankar2017-10-051-1/+2
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-2633-67/+67
|/ /
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-151-1/+1
|\|
| * Use QSharedPointer::create() moreMarc Mutz2017-07-311-1/+1
* | Reduce the scope of the preprocessor branches with the help of a unionJake Petroules2017-08-092-60/+30