summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-241-24/+24
|\ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * 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-221-0/+2
| |/ | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-191-1/+1
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * 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
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-272-361/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro
* \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-04-221-46/+76
|\ \ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp
| * | Fixes for solution package.Jan-Arve Sæther2009-04-221-46/+76
| | |
* | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeuiMichael Brasser2009-04-221-9/+5
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | update the package script according to class renamingKent Hansen2009-04-211-4/+4
| | |
| * | remove QItemAnimation and add the interpolator for QColorThierry Bastian2009-04-201-0/+1
| | |
| * | cleanup in demoThierry Bastian2009-04-201-1/+0
| | | | | | | | | | | | sub-attaq doesn't use anymore animation private headers
| * | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-175-0/+1684
| /
* | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-222-0/+337
|/
* Long live Qt!Lars Knoll2009-03-234-0/+1353