| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
Use .XXXXX in mktemp.
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
| |
| |
| |
| | |
subfolder.
|
|\ \ |
|
| | |
| | |
| | |
| | | |
after repository change. Also supporting now toolbar pixel metrics calculations.
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
Update the script, and update the generated file.
Reviewed-by: Thiago
Reviewed-by: Paul Olav Tvete
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Don't require any arguments by default, get the repo path from git config
and updated the default tag.
Reviewed-by: Trust me
|
| |
|
|
|