summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
|/ /
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-072-0/+4
|\|
| * Doc: Check before including the \snippet from a .pro fileVenugopal Shivashankar2018-08-302-0/+4
* | WebAssembly for QtBaseMorten Johan Sørvig2018-08-301-0/+22
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-171-3/+3
|\|
| * doc: Add missing override and remove redundant virtual for snippetsAlexander Volkov2018-08-161-3/+3
* | Guard QGL2PaintEngineEx/QGLPaintDevice against using unset contextTor Arne Vestbø2018-08-072-2/+2
* | Be more explicit about the effects of swapBuffers() on the current contextTor Arne Vestbø2018-08-061-1/+2
* | QGLWidget: Gracefully handle failed makeCurrent during resize and paint eventTor Arne Vestbø2018-07-202-4/+15
* | qdoc: properly omit comments for enums marked with omitvalueChristian Ehrlicher2018-03-271-6/+6
|/
* Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-151-1/+1
|\
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-261-4/+13
| |\
| * | MSVC: Don't set a DLL base address for 64-bitThiago Macieira2018-01-241-1/+1
* | | Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-141-4/+13
|\ \ \ | | |/ | |/|
| * | Document licenses for all Qt modulesKai Koehne2018-01-241-4/+13