summaryrefslogtreecommitdiffstats
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-031-0/+1
|\
| * add .make.cache files to .gitignoreShane Kearns2009-09-021-0/+1
| | | | | | | | Reviewed-By: Iain
* | Update .gitignore to show new files in declarative/examples and ↵Yann Bodson2009-08-271-0/+2
| | | | | | | | declarative/demos
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-251-0/+29
|\ \ | |/ | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf tools/configure/configureapp.cpp
| * Merge commit 'qt/master'Jason Barron2009-08-211-0/+1
| |\
| | * move qdoc3 binary to bin, so we can use it for Qt Creator without hacks.Daniel Molkentin2009-08-211-0/+1
| | | | | | | | | | | | | | | | | | | | | Most Linux distributions already move qdoc3 to that place for exactly this reason anyway. Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | Don't show Symbian plugin stubs in Git.axis2009-05-041-0/+1
| | |
| * | Long live Qt for S60!axis2009-04-241-0/+201
| /
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-191-0/+2
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * ignore some moreOswald Buddenhagen2009-06-151-0/+2
| |
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+174
|
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-0/+4
|
* Long live Qt!Lars Knoll2009-03-231-0/+174