summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Long live Qt 4.5!Lars Knoll2009-03-23214-0/+97570
|
* Long live Qt for S60!axis2009-04-24221-0/+100929