summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | introduce QT_NO_NETWORKDISKCACHEPeter Hartmann2009-03-251-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that was necessary because when defining QT_NO_TEMPORARYFILE there would be a compile error in qnetworkdisccache.h, which uses a QTemporaryFile. Moreover, the script "make_qfeatures_dot_h" was updated to generate LGPL license header. Reviewed-by: Paul Task-number: 248807
| * | | | | | Long live Qt!Lars Knoll2009-03-23214-0/+97599
| / / / / /
* | | | | | More usable output of the s60theme utilityAlessandro Portale2009-06-082-3/+7
| | | | | |
* | | | | | S60theme util's README typos fixed.Sami Merilä2009-06-081-4/+4
| | | | | |
* | | | | | Proper English sentenceAlessandro Portale2009-06-071-2/+2
| | | | | |
* | | | | | Added a README to give people a hint of what this obscure piece ofAlessandro Portale2009-06-071-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | code does.
* | | | | | 's60theme' is a commandline tool which converts Carbide.ui themes intoAlessandro Portale2009-06-074-0/+441
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an intermediate binary format that can be read by the simulated QS60Style. So, for example Designer (standalone or in Carbide) will be able to display a realistic S60 Ui. The intermediate binary format hashes of QPictures and QColors, streamed to a QByteArray and compressed. The QS60Style could not load the Carbide.ui theme directly because SVG handling is unfortunately not part of QtGui, and would require a dependency on the QtSvg module. Also, 's60theme' uses QWebkit to parse the SVG graphics (inspired by Ariya's 'WebKit-based SVG rasterizer' labs post). QtSvg had some issues with the SVGs that come with Carbide.ui.
* | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-201-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/network-settings.h tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp tests/auto/qiodevice/tst_qiodevice.cpp tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| * | | | | Fix webkit import on cygwin and gentooSimon Hausmann2009-05-191-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Use .XXXXX in mktemp. Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-1864-12676/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/kernel/qcoreapplication.cpp Configure.exe not rebuilt because the changes are irrelevant for the S60 port. We'll rebuild it before merging back.
| * | | | Clean up old Qt 3 stuff.Thiago Macieira2009-05-1164-12676/+0
| | |_|/ | |/| | | | | | | | | | Reviewed-By: TrustMe
* | | | S60Style: renamed pixelmetricsmapper files and relocated them all under one ↵Sami Merilä2009-05-0512-29/+34
| | | | | | | | | | | | | | | | subfolder.
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-04-278-23/+403
|\ \ \ \
| * | | | S60Style: new version of pixel metrics harvester. Adding back missing files ↵Sami Merilä2009-04-248-23/+403
| | | | | | | | | | | | | | | | | | | | after repository change. Also supporting now toolbar pixel metrics calculations.
* | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-273-23/+57
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
| * | | Make all qdoc footers consistent with the main Qt docs.Jason McDonald2009-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same copyright message in all doc footers. As a side-effect, this change also removes most of the remaining THISYEAR placeholders, and fixes some footers that try to use 110% of the page width. Reviewed-by: Thiago
| * | | Make make_qfeatures_dot_h script generate the current copyright header.Jason McDonald2009-04-221-5/+36
| | |/ | |/| | | | | | | | | | | | | | | | Update the script, and update the generated file. Reviewed-by: Thiago Reviewed-by: Paul Olav Tvete
| * | Make mkdist-webkit work from in-source buildsSimon Hausmann2009-04-021-1/+1
| |/ | | | | | | | | | | | | Explicitly unset QTDIR_build, to make sure we generate Makefiles with real rules to call the extra tools. Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
| * Simplify WebKit import scriptSimon Hausmann2009-04-021-16/+19
| | | | | | | | | | | | | | Don't require any arguments by default, get the repo path from git config and updated the default tag. Reviewed-by: Trust me
generated by cgit v0.12 at 2025-02-03 03:55:14 (GMT)