summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-1344-131/+155
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * Fix WebKit import from the trunk (part 2)Simon Hausmann2009-08-121-1/+27
| | | | | | | | | | | | Fix generation of WebKit version file by including the xcconfig file. Reviewed-by: Trust me
| * Fix import of WebKit.Simon Hausmann2009-08-121-1/+0
| | | | | | | | | | | | Don't try to remove WebCore/svg/graphics/wince, it doesn't exist anymore. Reviewed-by: Trust me
| * Replace "Trolltech" with more appropriate terms.Jason McDonald2009-08-1217-19/+19
| | | | | | | | Reviewed-by: Trust Me
| * Update references to online documentation.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Update URL's to use new domain.Jason McDonald2009-08-122-3/+3
| | | | | | | | Reviewed-by: Trust Me
| * Update contact URL in license headers.Jason McDonald2009-08-1240-106/+105
| | | | | | | | Reviewed-by: Trust Me
* | Update license headers according to commit 858c70f768e.axis2009-08-0614-28/+28
| | | | | | | | RevBy: Trust me
* | Merge commit 'qt/master-stable'Jason Barron2009-08-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * Updated WebKit to qtwebkit-4.6-snapshot-29072009Simon Hausmann2009-07-291-1/+1
| | | | | | | | | | Reviewed-by: Trust me (and also trust Pulse :)
* | Merge commit 'qt/master-stable'Jason Barron2009-07-301-2/+14
|\ \ | |/ | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * Fix webkit import from the trunkSimon Hausmann2009-07-281-2/+14
| | | | | | | | | | | | | | Exclude more files from the import that are not needed for the Qt build, and include jsc for qtscript debugging. Reviewed-by: Trust me
* | Merge commit 'qt/master-stable'Jason Barron2009-07-271-4/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 to today's WebKit 4.6 snapshotSimon Hausmann2009-07-131-1/+1
| |
| * Fix import of WebKit from the trunkSimon Hausmann2009-07-131-2/+0
| | | | | | | | | | | | Don't try to remove the scons files, as they were removed upstream. Reviewed-by: Trust me
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-131-1/+1
| |\
| | * Fix WebKit import urlSimon Hausmann2009-07-131-1/+1
| | | | | | | | | | | | | | | | | | Fix the contents of src/3rdparty/webkit/VERSION to point to gitorious.org Reviewed-by: Trust me
| * | Merge branch '4.5'Thiago Macieira2009-07-021-10/+87
| |\ \ | | |/
| * | Merge branch '4.5'Thiago Macieira2009-07-021-0/+1
| |\ \
* | \ \ Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-10/+88
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-071-10/+88
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
| | * | | Fixed the build on Windows after regenerating the unicode tables.Denis Dzyubenko2009-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | Fixed the license header that the unicode table generated uses.Denis Dzyubenko2009-07-011-8/+85
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Also made sure that the generated code will not have trailing whitespaces. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | operator==() for Unicode properties was omitting one property, which ↵Chusslove Illich (Часлав Илић)2009-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | resulted in wrong choice of unique properties for characters 451-45f. Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-By: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2941-86/+86
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3042-90/+98
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Small fix for the WebKit import from the trunk.Simon Hausmann2009-06-291-1/+1
| | | | | | | | | | | | | | | | Don't try to remove the symbian/ directory, it doesn't exist anymore.
| * | | Update WebKit to today's snapshot, after receiving a green light from pulse.Simon Hausmann2009-06-291-1/+1
| | | |
| * | | Update src/3rdparty/webkit to a new snapshot.Simon Hausmann2009-06-241-1/+1
| | | |
| * | | Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-1641-86/+86
| |\ \ \ | | | |/ | | |/|
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-1641-86/+86
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Lock down src/3rdparty/webkit to a specific tag.Simon Hausmann2009-06-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed some unused files from the import. Reviewed-by: Tor Arne Reviewed-by: Kent Hansen
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-255-43/+78
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | small refactoring to reduce memory usage of static dataThierry Bastian2009-06-091-3/+3
| | |
| * | Make sure that indexes in the autogenerated locale info do not exceed 16bit ↵Denis Dzyubenko2009-06-081-1/+11
| | | | | | | | | | | | | | | | | | range. Reviewed-By: TrustMe
| * | Fix webkit import from the trunk.Simon Hausmann2009-06-031-5/+1
| | | | | | | | | | | | | | | | | | Updated the file list, the SVG filters have been removed. Reviewed-by: Trust me
| * | Speed up util/normalize dir iterationMatteo Bertozzi2009-05-271-13/+9
| | | | | | | | | | | | | | | | | | | | | Use QDirIterator to speed up iterating over directories in normalize util. Reviewed-by: Eskil
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-191-1/+1
| |\ \ | | |/
| * | Merge branch '4.5'Thiago Macieira2009-05-1164-12676/+0
| |\ \
| * | | Slim down WebKit import a bit moreSimon Hausmann2009-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove v8 JS bindings. Reviewed-by: Trust me
| * | | Reduced the number of files in the WebKit importSimon Hausmann2009-05-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Exclude chromium files from the import. Reviewed-by: Trust me
| * | | Fixed import of WebKit trunkSimon Hausmann2009-05-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Don't try to remove scons files that don't exist anymore. Reviewed-by: Trust me
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-232-7/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| * \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-021-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * | | | | Changed WebKit import script to default to import from the trunk instead of 4.5Simon Hausmann2009-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust me
| * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-021-16/+19
| |\ \ \ \ \
| * | | | | | Fix up WebKit import from the trunk.Simon Hausmann2009-04-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4 has been moved to autotools/ Reviewed-by: Trust me
| * | | | | | Fix WebKit import from the trunk.Simon Hausmann2009-04-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/plugins/wx is gone. Reviewed-by: Trust me
| * | | | | | Exclude the autotools subdirectory when importing from WebKit trunk.Simon Hausmann2009-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-12-29 12:41:42 (GMT)