summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Move QOpenGLBuffer from QtGui to QtOpenGLJohan Klokkhammer Helsing2020-02-225-1/+767
* Move QOpenGLVertexArrayObject from QtGui to QtOpenGLJohan Klokkhammer Helsing2020-02-216-1/+767
* Move QOpenGLShaderProgram from QtGui to QtOpenGLJohan Klokkhammer Helsing2020-02-205-1/+4128
* Docs: Remove traces of QGLJohan Klokkhammer Helsing2020-02-201-4/+4
* Move QOpenGLWidget from QtOpenGL to its own moduleJohan Klokkhammer Helsing2020-02-184-1604/+0
* Move QOpenGLFrameBufferObject from QtGui to QtOpenGLJohan Klokkhammer Helsing2020-02-177-6/+2215
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-02-132-2/+4
|\
| * Doc/QtBase: replace some 0 with \nullptrChristian Ehrlicher2020-01-261-1/+1
* | CMake: Regenenerate projects where recent changes happenedAlexandru Croitor2020-02-111-0/+1
* | Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-02-102-0/+10
|\ \
| * | Regenerate projects to correctly handle private dependenciesAlexandru Croitor2020-02-052-0/+10
* | | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"Alexandru Croitor2020-02-072-0/+114
|\ \ \ | |/ /
| * | Post-merge fixesAlexandru Croitor2020-01-302-26/+40
| * | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-2931-3/+16113
| |\ \
| * | | Post Merge FixesLeander Beernaert2020-01-241-26/+12
| * | | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-2451-24503/+5470
| |\ \ \
| * | | | 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
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * | | | | | | | Fix architecture conditionsAlexandru Croitor2019-04-031-1/+1
| * | | | | | | | CMake: Re-generate openglTobias Hunger2019-04-021-16/+19
| * | | | | | | | CMake: Add widgets examplesTobias Hunger2019-03-261-0/+3
| * | | | | | | | CMake: Introduce Q_OBJECT qdoc macroTobias Hunger2019-01-253-8/+2
| * | | | | | | | CMake: Use AUTOMOC/AUTOUIC/AUTORCCTobias Hunger2018-12-141-0/+6
| * | | | | | | | Begin port of qtbase to CMakeSimon Hausmann2018-11-011-0/+58
* | | | | | | | | Move QOpenGLTextureBlitter from QtGui to QtOpenGLJohan Klokkhammer Helsing2020-02-044-1/+775
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Move QOpenGLTexture and related classes from QtGui to QtOpenGLJohan Klokkhammer Helsing2020-01-248-0/+7590
* | | | | | | | Move QOpenGLPaintEngine and related classes from QtGui to QtOpenGLJohan Klokkhammer Helsing2020-01-2224-3/+8523
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | 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
|/ / / / /
* | | | | QPainter: don't print deprecated warnings for HighQualityAntialiasingChristian Ehrlicher2019-10-031-0/+3
| |_|_|/ |/| | |
* | | | Port some trivial cases from QMutex to QRecursiveMutexMarc Mutz2019-07-061-6/+1