Merge commit 'qt/master'
authorJason Barron <jbarron@trolltech.com>
Tue, 18 Aug 2009 06:34:18 +0000 (08:34 +0200)
committerJason Barron <jbarron@trolltech.com>
Tue, 18 Aug 2009 06:34:18 +0000 (08:34 +0200)
commitfd6740b6ade6e7f8e51a9cc558b723e7fae15ccf
treeaa2ba4ce64d047d73c29ab0616e8a89d352c3abd
parentd24029e3d4639f1300e7a68858936911df969f69
parent572e165dcb8cc8fcdfaa4ab9bdab050f6a6cc173
Merge commit 'qt/master'

Conflicts:
doc/src/examples.qdoc
doc/src/plugins-howto.qdoc
doc/src/topics.qdoc
examples/phonon/musicplayer/mainwindow.cpp
src/3rdparty/freetype/src/base/ftobjs.c
src/corelib/global/qglobal.h
src/corelib/tools/qalgorithms.h
src/corelib/tools/qshareddata.cpp
src/corelib/tools/qsharedpointer.cpp
src/corelib/tools/tools.pri
src/corelib/xml/qxmlstream.h
src/gui/painting/painting.pri
src/gui/widgets/qdatetimeedit.cpp
tests/auto/qdesktopservices/qdesktopservices.pro
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qtextcodec/test/test.pro
181 files changed:
demos/macmainwindow/macmainwindow.pro
doc/src/development/qmake-manual.qdoc
doc/src/getting-started/installation.qdoc
doc/src/howtos/appicon.qdoc
doc/src/platforms/emb-install.qdoc
doc/src/platforms/platform-notes.qdoc
examples/phonon/musicplayer/mainwindow.cpp
qmake/Makefile.unix
qmake/Makefile.win32
qmake/Makefile.win32-g++
qmake/Makefile.win32-g++-sh
qmake/generators/makefile.cpp
qmake/qmake.pri
src/3rdparty/freetype/src/base/ftobjs.c
src/3rdparty/freetype/src/base/ftstream.c
src/3rdparty/freetype/src/truetype/ttinterp.c
src/3rdparty/freetype/src/truetype/ttpload.c
src/corelib/concurrent/qthreadpool.cpp
src/corelib/corelib.pro
src/corelib/global/qglobal.cpp
src/corelib/global/qglobal.h
src/corelib/global/qlibraryinfo.cpp
src/corelib/global/qnamespace.qdoc
src/corelib/io/qdir.cpp
src/corelib/io/qfile.cpp
src/corelib/io/qfsfileengine_win.cpp
src/corelib/io/qiodevice.cpp
src/corelib/io/qprocess.cpp
src/corelib/io/qresource.cpp
src/corelib/io/qsettings.cpp
src/corelib/io/qtemporaryfile.cpp
src/corelib/io/qtextstream.cpp
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcoreapplication.cpp
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qsharedmemory.cpp
src/corelib/kernel/qsystemsemaphore.cpp
src/corelib/kernel/qvariant.cpp
src/corelib/plugin/qlibrary.cpp
src/corelib/plugin/qpluginloader.cpp
src/corelib/plugin/quuid.cpp
src/corelib/thread/qthread.cpp
src/corelib/thread/qthreadstorage.cpp
src/corelib/tools/qbytearray.cpp
src/corelib/tools/qdatetime.cpp
src/corelib/tools/qhash.cpp
src/corelib/tools/qlist.cpp
src/corelib/tools/qlocale.cpp
src/corelib/tools/qmap.cpp
src/corelib/tools/qregexp.cpp
src/corelib/tools/qshareddata.cpp
src/corelib/tools/qsharedpointer.cpp
src/corelib/tools/qsharedpointer_impl.h
src/corelib/tools/qstring.cpp
src/corelib/tools/qtextboundaryfinder.cpp
src/corelib/tools/qvector.cpp
src/corelib/tools/tools.pri
src/corelib/xml/qxmlstream.cpp
src/corelib/xml/qxmlstream.h
src/gui/dialogs/qdialog.cpp
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qmessagebox.cpp
src/gui/dialogs/qprintpreviewdialog.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicslayoutitem.cpp
src/gui/graphicsview/qgraphicslayoutitem.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
src/gui/graphicsview/qgraphicssceneevent.cpp
src/gui/graphicsview/qgraphicstransform.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/graphicsview/qgraphicswidget.h
src/gui/image/image.pri
src/gui/image/qbitmap.cpp
src/gui/image/qimage.cpp
src/gui/image/qpicture.cpp
src/gui/image/qpixmap.cpp
src/gui/image/qpixmapcache.cpp
src/gui/inputmethod/qinputcontextfactory.cpp
src/gui/itemviews/qabstractitemview.cpp
src/gui/itemviews/qheaderview.cpp
src/gui/itemviews/qitemdelegate.cpp
src/gui/itemviews/qstandarditemmodel.cpp
src/gui/itemviews/qstandarditemmodel_p.h
src/gui/itemviews/qstyleditemdelegate.cpp
src/gui/itemviews/qtreewidget.cpp
src/gui/kernel/kernel.pri
src/gui/kernel/qaction.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/kernel/qboxlayout.cpp
src/gui/kernel/qcursor.cpp
src/gui/kernel/qkeysequence.cpp
src/gui/kernel/qlayout.cpp
src/gui/kernel/qsound.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_mac.mm
src/gui/painting/painting.pri
src/gui/painting/qbrush.cpp
src/gui/painting/qdrawhelper_p.h
src/gui/painting/qpaintengine.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpainter.cpp
src/gui/painting/qpainterpath.cpp
src/gui/painting/qpainterpath.h
src/gui/painting/qprinter.cpp
src/gui/painting/qregion.cpp
src/gui/styles/qcommonstyle.cpp
src/gui/styles/styles.pri
src/gui/text/qcssparser.cpp
src/gui/text/qfont.cpp
src/gui/text/qfontdatabase.cpp
src/gui/text/qfontmetrics.cpp
src/gui/text/qtextcontrol.cpp
src/gui/text/qtextformat.cpp
src/gui/text/qtextlayout.cpp
src/gui/text/qtextoption.cpp
src/gui/text/qtexttable.cpp
src/gui/text/qzip.cpp
src/gui/text/text.pri
src/gui/widgets/qcalendarwidget.cpp
src/gui/widgets/qcombobox.cpp
src/gui/widgets/qdatetimeedit.cpp
src/gui/widgets/qlineedit.cpp
src/gui/widgets/qlineedit_p.cpp
src/gui/widgets/qmainwindow.cpp
src/gui/widgets/qmenu.cpp
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qplaintextedit.cpp
src/gui/widgets/qprintpreviewwidget.cpp
src/gui/widgets/qspinbox.cpp
src/gui/widgets/qtextedit.cpp
src/network/access/qftp.cpp
src/network/access/qhttp.cpp
src/network/access/qnetworkrequest.cpp
src/network/kernel/kernel.pri
src/network/kernel/qhostaddress.cpp
src/network/kernel/qhostinfo.cpp
src/network/kernel/qnetworkinterface.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qnativesocketengine.cpp
src/network/socket/qtcpserver.cpp
src/network/socket/qudpsocket.cpp
src/network/ssl/qsslcertificate.cpp
src/network/ssl/qsslcipher.cpp
src/network/ssl/qsslerror.cpp
src/network/ssl/qsslkey.cpp
src/network/ssl/ssl.pri
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
src/opengl/qglframebufferobject.cpp
src/opengl/qglpixelbuffer.cpp
src/script/qscriptable.cpp
src/script/qscriptclass.cpp
src/script/qscriptcontext.cpp
src/script/qscriptcontextinfo.cpp
src/script/qscriptengine.cpp
src/script/qscriptengineagent.cpp
src/script/qscriptstring.cpp
src/script/qscriptvalue.cpp
src/script/qscriptvalueiterator.cpp
src/scripttools/debugging/qscriptstdmessagehandler.cpp
src/svg/qsvggenerator.cpp
src/svg/svg.pro
src/testlib/testlib.pro
src/xml/dom/qdom.cpp
src/xml/sax/qxml.cpp
src/xmlpatterns/api/qabstractxmlnodemodel.cpp
tests/auto/auto.pro
tests/auto/qdesktopservices/qdesktopservices.pro
tests/auto/qfilesystemmodel/qfilesystemmodel.pro
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qsharedpointer/tst_qsharedpointer.cpp
tests/auto/qtextcodec/test/test.pro
tools/configure/configure.pro