summaryrefslogtreecommitdiffstats
path: root/examples/examples.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-021-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| * add gesture examples to the examples.pro SUBDIRSBradley T. Hughes2009-06-101-1/+2
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-261-0/+2
| |\ | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h
| * | build the multitouch examples from the top-level buildBradley T. Hughes2009-05-081-1/+2
| | | | | | | | | | | | just needed to add multitouch to SUBDIRS in examples/examples.pro
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-271-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | fix two .pro file bugsKent Hansen2009-05-201-1/+1
| | |
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-121-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-171-0/+45
| /
* | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-221-1/+1
|\ \ | |/
| * Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-201-1/+1
| | | | | | | | | | | | | | Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+43
|
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-0/+3
|
* Long live Qt!Lars Knoll2009-03-231-0/+43