summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-121-1/+1
| | | | Reviewed-by: Trust Me
* Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+1
|
* Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-231-24/+22
|\ | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| * Attempt to fix header installation for Phonon.Thiago Macieira2009-06-231-24/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the long-standing issue of whether Phonon headers should be written with a capital P or a lowercase one. KDE releases of Phonon had <Phonon/CapitalClassName> whereas Qt 4.4 had <phonon/filename.h>. I tried to solve this before by adding a Phonon subdir next to phonon in include/, but that only compounded the error: the presence of two dirs caused problems and the installation wasn't fixed. So instead try to place Phonon/ClassName inside include/phonon. And fix the installation to do it properly: just copy the include/$lib dir into the target, then overwrite the .h files with the sources from src/$lib. Reviewed-by: Marius Storm-Olsen
* | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-231-0/+2
|/ | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* Update license headers as requested by the marketing department.Jason McDonald2009-06-161-1/+1
| | | | Reviewed-by: Trust Me
* Long live Qt 4.5!Lars Knoll2009-03-234-0/+1353