Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
authoraxis <qt-info@nokia.com>
Fri, 24 Apr 2009 14:03:55 +0000 (16:03 +0200)
committeraxis <qt-info@nokia.com>
Mon, 27 Apr 2009 07:09:01 +0000 (09:09 +0200)
commite74c8dc65e2feffb9a55d00aee5ca634fba41df8
tree3a131f9235fb6a455793178d8313655e4fd0036e
parent8f427b2b914d5b575a4a7c0ed65d2fb8f45acc76
parent211bea9838bcc2acd7f54b65468fe1be2d81b1e0
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

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
120 files changed:
configure.exe
doc/src/examples.qdoc
doc/src/installation.qdoc
doc/src/qmake-manual.qdoc
doc/src/qnamespace.qdoc
doc/src/snippets/code/doc_src_installation.qdoc
examples/examples.pro
examples/network/network.pro
examples/painting/painting.pro
examples/webkit/webkit.pro
examples/widgets/movie/movie.pro
qmake/generators/makefile.cpp
qmake/generators/makefile.h
qmake/generators/metamakefile.cpp
qmake/generators/win32/msvc_vcproj.cpp
qmake/project.cpp
src/corelib/global/qglobal.cpp
src/corelib/global/qglobal.h
src/corelib/global/qnamespace.h
src/corelib/io/qfile.cpp
src/corelib/io/qprocess.cpp
src/corelib/io/qtemporaryfile.cpp
src/corelib/kernel/qcoreapplication.cpp
src/corelib/thread/qthread.cpp
src/corelib/thread/qthread_unix.cpp
src/corelib/tools/qlocale.cpp
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfileinfogatherer.cpp
src/gui/dialogs/qfilesystemmodel.cpp
src/gui/dialogs/qmessagebox.cpp
src/gui/image/qpixmap.cpp
src/gui/image/qpixmapcache.cpp
src/gui/itemviews/qabstractitemview.cpp
src/gui/itemviews/qheaderview.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_p.h
src/gui/util/qcompleter.cpp
src/gui/util/qdesktopservices.cpp
src/gui/widgets/qcombobox.cpp
src/gui/widgets/qmenu.cpp
src/network/access/qnetworkcookie.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qlocalserver_unix.cpp
src/network/socket/qlocalsocket_unix.cpp
src/network/socket/qnativesocketengine_unix.cpp
src/plugins/qpluginbase.pri
src/qbase.pri
src/src.pro
src/testlib/qtestcase.cpp
tests/arthur/common/paintcommands.cpp
tests/arthur/common/qengines.cpp
tests/auto/auto.pro
tests/auto/qabstractitemview/tst_qabstractitemview.cpp
tests/auto/qbitarray/tst_qbitarray.cpp
tests/auto/qcombobox/tst_qcombobox.cpp
tests/auto/qcompleter/tst_qcompleter.cpp
tests/auto/qcssparser/tst_cssparser.cpp
tests/auto/qdatastream/tst_qdatastream.cpp
tests/auto/qdatetime/tst_qdatetime.cpp
tests/auto/qdesktopservices/tst_qdesktopservices.cpp
tests/auto/qdir/tst_qdir.cpp
tests/auto/qdirmodel/tst_qdirmodel.cpp
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qfiledialog/tst_qfiledialog.cpp
tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
tests/auto/qfontdatabase/tst_qfontdatabase.cpp
tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
tests/auto/qhash/tst_qhash.cpp
tests/auto/qhttp/tst_qhttp.cpp
tests/auto/qicoimageformat/tst_qticoimageformat.cpp
tests/auto/qicon/tst_qicon.cpp
tests/auto/qimage/tst_qimage.cpp
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qitemview/tst_qitemview.cpp
tests/auto/qkeysequence/tst_qkeysequence.cpp
tests/auto/qlabel/tst_qlabel.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/auto/qlocale/tst_qlocale.cpp
tests/auto/qlocalsocket/test/test.pro
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
tests/auto/qmenu/tst_qmenu.cpp
tests/auto/qmenubar/tst_qmenubar.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qobject/tst_qobject.cpp
tests/auto/qpainter/tst_qpainter.cpp
tests/auto/qpixmap/tst_qpixmap.cpp
tests/auto/qprocess/tst_qprocess.cpp
tests/auto/qrect/tst_qrect.cpp
tests/auto/qregexp/tst_qregexp.cpp
tests/auto/qregion/tst_qregion.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
tests/auto/qsettings/tst_qsettings.cpp
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
tests/auto/qstring/tst_qstring.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtabbar/tst_qtabbar.cpp
tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp
tests/auto/qtextcodec/test/test.pro
tests/auto/qtextcodec/tst_qtextcodec.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qthread/tst_qthread.cpp
tests/auto/qtimer/tst_qtimer.cpp
tests/auto/qtreeview/tst_qtreeview.cpp
tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
tests/auto/qudpsocket/tst_qudpsocket.cpp
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
tests/auto/qwidget/tst_qwidget.cpp
tools/configure/configureapp.cpp