summaryrefslogtreecommitdiffstats
path: root/examples/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-07-276-20/+38
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * Update the documentation after the change in the completer exempleOlivier Goffart2009-07-171-2/+2
| |
| * Lets the size of the completer be configurable in a way similar to QComboBox.Frédéric Mercille2009-07-172-4/+23
| | | | | | | | | | Merge-request: 884 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-07-0585-180/+178
| |\
| | * These files don't have to have CRLF line-termination.Thiago Macieira2009-07-023-16/+14
| | | | | | | | | | | | The other files here don't, so I see no reason why these should
| * | Merge commit 'qt-mainline/master'Tobias Koenig2009-06-045-0/+229
| |\ \
| * | | Add W3C XML Schema validation supportTobias Koenig2009-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done by Tobias Koenig, as part of an internship at Trolltech/Qt Software, started at Wed Oct 1 18:32:43 2008 +0200, and the last commit being part of this commit dating Tue Feb 24 11:03:36 2009 +0100. This is work consisting of about 650 commits squashed into one, where the first commit was 61b280386c1905a15690fdd917dcbc8eb09b6283, in the repository before Qt's history cut.
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3082-164/+164
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Update license headers in files that are new in 4.6.Jason McDonald2009-06-172-4/+4
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-1680-160/+160
| |\ \ \ | | |_|/ | |/| |
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-1679-158/+158
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Long live Qt 4.5!Lars Knoll2009-03-23148-0/+12774
| | /
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-259-12/+239
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | compile (rand())Warwick Allison2009-05-151-0/+1
| | |
| * | Merge branch 'master' of ../master into contiguouscacheIan Walters2009-05-144-12/+10
| |\ \ | | |/
| | * Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-124-12/+10
| | | | | | | | | | | | We introduce this new enum, we should be using it.
| * | Update licensing headers.Ian Walters2009-04-073-0/+121
| | | | | | | | | | | | | | | Update files to have consistent licencesing with the rest of Qt.
| * | Rename OffsetVector to ContiguousCacheIan Walters2009-04-036-12/+12
| | |
| * | Squashed commit of the following:Rhys Weatherley2009-03-245-0/+107
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 39de3862f5678b3226b4932eeb342c4a023d2f2b Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 14:16:05 2009 +1000 Fixes: Test runs (and passes), doc links. Task: QT-308 Details: Minor changes related to the code having moved. commit 5a8910dd1018fb228d0e2e2819ea429577bfa834 Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 09:47:20 2009 +1000 Fixes: Checkin of QOffsetVector stuff for branch Task: QT-308 Details: Files originally from research/qcircularbuffer This checkin likely won't compile. Just a copy for now.
| * Long live Qt!Lars Knoll2009-03-23148-0/+12774
|
* Long live Qt for S60!axis2009-04-24148-0/+12822