summaryrefslogtreecommitdiff
path: root/src/libs/glsl
Commit message (Expand)AuthorAgeFilesLines
* GlslEditor: Fix crash in function hint proposalChristian Stenger2018-06-082-7/+3
* Fix compilation issues with C++17Eike Ziller2018-06-051-1/+1
* GLSL: Use override consistentlyTobias Hunger2018-05-086-219/+219
* Merge remote-tracking branch 'origin/4.5' into 4.6Eike Ziller2018-01-224-1790/+1796
|\
| * GLSL: Limit recovery attemptsNikolai Kosjar2018-01-184-1790/+1796
* | GLSL: Auto run qlalr generator when explicitly requestedNikolai Kosjar2018-01-081-20/+51
* | GLSL: Run qlalr generator on demand with qbsNikolai Kosjar2018-01-051-5/+36
|/
* GLSL: Avoid infinite loop at error recoveryNikolai Kosjar2017-09-282-323/+353
* GLSL: Fix conversion warnings on WindowsNikolai Kosjar2017-09-283-14/+14
* GLSL: Re-generate parserNikolai Kosjar2017-09-284-1767/+1790
* make library defines more consistencyTim Jenssen2016-12-123-3/+3
* Fix compiler warnings on windows.David Schulz2016-04-222-7/+7
* Wholesale conversion to #pragma oncehjk2016-03-3013-53/+13
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-1929-527/+373
* Make every operator bool() explicitDaniel Teske2015-06-021-1/+1
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-1229-186/+186
|\
| * Update LicenseEike Ziller2015-01-1629-186/+186
* | GLSL: Remove unused RecursiveMemoryPoolNikolai Kosjar2015-02-092-30/+0
* | Misc: Remove unneeded qualificationsOrgad Shaneh2015-02-062-3/+3
|/
* qbs build: Remove unneeded import statements.Christian Kandeler2014-11-101-1/+0
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-1429-217/+248
|\
| * License updateEike Ziller2014-10-0929-217/+248
* | use DISTFILES instead of OTHER_FILES in creator's own build systemOswald Buddenhagen2014-09-151-1/+1
* | C++: remove reserved names.Erik Verbruggen2014-08-281-5/+5
|/
* GLSL: Fix duplicate conditionOrgad Shaneh2014-05-191-1/+1
* use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
* Incremented year in copyright infoRobert Loehning2014-01-0829-31/+31
* Rename "[Mm]ethod(s)" to "[Ff]unction(s)"Nikolai Kosjar2013-10-101-1/+1
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
* GLSL: Initialize member pointer to 0Nikolai Kosjar2013-09-171-1/+1
* Fix coding style for else statementsOrgad Shaneh2013-07-172-6/+5
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-281-1/+0
|\
| * Remove duplicate module dependencies from qbs files.Christian Kandeler2013-05-271-1/+0
* | derive TARGET from QTC_{LIB,PLUGIN}_NAMEOswald Buddenhagen2013-04-031-1/+0
* | make library and plugin dependencies declarativeOswald Buddenhagen2013-04-032-2/+3
* | centralize assignment of TEMPLATE = libOswald Buddenhagen2013-04-021-1/+0
* | define QT_CREATOR centrallyOswald Buddenhagen2013-04-023-4/+1
* | automatically include libs' and plugins' _dependencies.pri filesOswald Buddenhagen2013-04-021-1/+0
* | factor out all library dependencies to _dependencies.pri filesOswald Buddenhagen2013-04-022-1/+2
* | Fix Krazy warnings about includes/header guards in various editors.Friedemann Kleint2013-03-121-1/+1
|/
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-3129-31/+31
|\
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-2929-31/+31
* | Generalize QT_NO_CAST_FROM_ASCIIOrgad Shaneh2013-01-162-4/+2
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-9/+6
* | GLSL: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-12-046-20/+23
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-0529-654/+623
|\ \ | |/
| * Adjust license headershjk2012-10-0529-654/+623
* | qbs files: Consolidate includePaths in QtcLibrary and QtcPluginOrgad Shaneh2012-10-051-9/+0
* | qbs files: Sort filesOrgad Shaneh2012-10-031-19/+19
|/
* Fix qbs build for Qt 5.Christian Kandeler2012-09-171-2/+2