summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Post Merge FixesLeander Beernaert2020-01-241-26/+12
* Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-2451-24503/+5470
|\
| * Move QOpenGLWindow from QtGui to QtOpenGLJohan Klokkhammer Helsing2020-01-153-0/+807
| * Make the opengl module optionally depend on widgetsJohan Klokkhammer Helsing2020-01-141-2/+2
| * Move QOpenGLWidget from QtWidgets to QtOpenGLJohan Klokkhammer Helsing2019-12-123-0/+1592
| * Move QOpenGLTimerQuery to from QtGui to QtOpenGLJohan Klokkhammer Helsing2019-12-124-0/+1190
| * Move QOpenGLDebugLogger from QtGui to QtOpenGLJohan Klokkhammer Helsing2019-12-113-0/+2051
| * Remove deprecated QGL* classesJohan Klokkhammer Helsing2019-12-1145-24682/+8
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-041-1/+1
| |\
| | * Fix depth in renderText()Laszlo Agocs2019-12-031-1/+1
| * | Avoid initializing QFlags with 0 or nullptr in further casesFriedemann Kleint2019-11-221-1/+2
| * | Deprecate constructing QFlags from a pointerAllan Sandfeld Jensen2019-11-201-1/+1
| |/
* | Regenerate src/*Alexandru Croitor2019-11-142-17/+8
* | Regenerate everything under ./srcAlexandru Croitor2019-11-121-3/+0
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-141-0/+3
|\|
| * QPainter: don't print deprecated warnings for HighQualityAntialiasingChristian Ehrlicher2019-10-031-0/+3
* | Fix add_qt_docs callsSimon Hausmann2019-09-191-1/+1
* | Re-generate main module CMake filesSimon Hausmann2019-09-181-1/+1
* | Regenerate src/openglAlexandru Croitor2019-09-111-6/+0
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-116-12/+11
|\|
| * Port some trivial cases from QMutex to QRecursiveMutexMarc Mutz2019-07-061-6/+1
| * QPainter: mark obsolete RenderHints as deprecatedChristian Ehrlicher2019-07-031-1/+4
| * Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-06-271-0/+1
| |\
| | * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-05-031-0/+1
| * | Port from QAtomic::load() to loadRelaxed()Giuseppe D'Angelo2019-06-204-5/+5
* | | Fix OpenGL vs. GLESv2 linkage, attempt number threeSimon Hausmann2019-06-051-1/+0
* | | Regenerate the main qtbase modulesAlexandru Croitor2019-06-052-0/+2
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-031-1/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-05-131-1/+1
| |\|
| | * Doc: replace even more null/0/nullptr with \nullptr macroChristian Ehrlicher2019-05-081-1/+1
* | | Regenerate openglAlexandru Croitor2019-05-202-1/+66
* | | CMake: Regenerate src/openglTobias Hunger2019-05-061-7/+9
* | | Merge commit 'dev' into 'wip/cmake-merge'Tobias Hunger2019-04-1620-174/+295
|\| |
| * | More nullptr usage in headersKevin Funk2019-03-147-15/+15
| |/
| * Fix can not -> cannotRobert Loehning2019-02-251-1/+1
| * QtGui/Network/OpenGl/Widgets/Xml: use \nullptr in documentationChristian Ehrlicher2019-02-202-4/+7
| * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-02-084-59/+92
| |\
| | * QtOpenGL: Unify license headersKai Koehne2019-01-294-59/+92
| * | QtBase: replace 0 with \nullptr in documentationChristian Ehrlicher2019-01-281-3/+3
| * | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-041-1/+1
| |\|
| | * Fix warnings building with --std=c++11 and gcc 8Allan Sandfeld Jensen2018-12-141-1/+1
| * | Use Q_DISABLE_COPY_MOVE for private classesFriedemann Kleint2018-12-122-2/+2
| * | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-11-221-19/+0
| |\|
| | * Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-11-191-19/+0
| | |\
| | | * Purge some unused code for the OpenGL library nameEdward Welbourne2018-11-121-19/+0
| * | | doc: Fix all clang parse errors in QtBase during PCH buildMartin Smith2018-11-052-27/+0
| * | | Generate documentation .tags files for all of the docsFrederik Gladhorn2018-10-311-0/+2
| * | | QGLWidget: Prevent premature platform window creationTor Arne Vestbø2018-10-311-16/+13
| |/ /
| * | Doc: Move literal code block to a separate fileCristian Maureira-Fredes2018-10-156-85/+217
* | | Fix architecture conditionsAlexandru Croitor2019-04-031-1/+1