projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 98a4db7 2735bc6)
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 7 Sep 2010 11:30:11 +0000 (13:30 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 7 Sep 2010 11:30:11 +0000 (13:30 +0200)
commit2b6dd2c7b44e37e79b1ae929a761c17929a2e569
tree30f3c55312be601d29c0acbc318db75d7d06b188tree | snapshot
parent98a4db7321cb286cd0a7a07adeb265798a650515commit | diff
parent2735bc6759f881c786a1097580a8682e3d28f365commit | diff
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
qmake/Makefile.win32
src/corelib/io/qfsfileengine_win.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/gui/dialogs/qfiledialog_win.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/text/qfontdatabase_win.cpp
src/gui/util/qsystemtrayicon_win.cpp
src/script/utils/qscriptdate.cpp
tests/auto/qinputcontext/tst_qinputcontext.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
26 files changed:
configure diff1 | diff2 | blob | history
examples/examples.pro diff1 | diff2 | blob | history
qmake/Makefile.win32 diff1 | diff2 | blob | history
qmake/Makefile.win32-g++ diff1 | diff2 | blob | history
qmake/Makefile.win32-g++-sh diff1 | diff2 | blob | history
qmake/qmake.pri diff1 | diff2 | blob | history
src/corelib/io/qfsfileengine_win.cpp diff1 | diff2 | blob | history
src/corelib/io/qsettings.cpp diff1 | diff2 | blob | history
src/corelib/kernel/qeventdispatcher_win.cpp diff1 | diff2 | blob | history
src/gui/dialogs/qfiledialog_win.cpp diff1 | diff2 | blob | history
src/gui/dialogs/qwizard_win.cpp diff1 | diff2 | blob | history
src/gui/kernel/qapplication_win.cpp diff1 | diff2 | blob | history
src/gui/kernel/qdesktopwidget_win.cpp diff1 | diff2 | blob | history
src/gui/kernel/qwidget_win.cpp diff1 | diff2 | blob | history
src/gui/styles/qwindowsstyle.cpp diff1 | diff2 | blob | history
src/gui/styles/qwindowsvistastyle.cpp diff1 | diff2 | blob | history
src/gui/styles/qwindowsxpstyle.cpp diff1 | diff2 | blob | history
src/gui/text/qfontdatabase_win.cpp diff1 | diff2 | blob | history
src/gui/text/qfontengine_win.cpp diff1 | diff2 | blob | history
src/gui/util/qdesktopservices_win.cpp diff1 | diff2 | blob | history
src/gui/util/qsystemtrayicon_win.cpp diff1 | diff2 | blob | history
src/network/kernel/qnetworkproxy_win.cpp diff1 | diff2 | blob | history
src/network/ssl/qsslsocket_openssl_symbols.cpp diff1 | diff2 | blob | history
src/opengl/qgl.cpp diff1 | diff2 | blob | history
src/tools/bootstrap/bootstrap.pro diff1 | diff2 | blob | history
tests/auto/qscriptengine/tst_qscriptengine.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e