Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update license headers according to commit 858c70f768e.	axis	2009-08-06	1	-2/+2
\| \| \| \|	RevBy: Trust me
*	Replaced $MODULE$ with hardcoded module names.	axis	2009-08-06	1	-1/+1
\| \| \| \|	RevBy: Trust me
*	Merge commit 'origin/master'	Jason Barron	2009-08-04	2	-85/+124
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
\| *	Cleanup and applied Qt coding style for qnetworkinterface_symbian.cpp	Janne Anttila	2009-08-04	1	-68/+46
\| \|
\| *	Trailing whitespace and tab/space fixes for QtNetwork	Janne Anttila	2009-08-03	2	-38/+38
\| \|
\| *	Small optimization.	Aleksandar Sasha Babic	2009-07-24	1	-0/+4
\| \| \| \| \| \| \| \|	Do not use route info for addresses other than IPV4.
\| *	For some reason interface info on Symbian will not	Aleksandar Sasha Babic	2009-07-24	1	-2/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	give neither correct netmask nor broadcast address. But, experiments show that route info can be used to obtain netmask. Then is easy to calculate broadcast address. Idea is to match interface and destination address from routeinfo entry, and then to use given netmask. "Machines take me by surprise with great frequency." Alan Turing(1912 - 1954)
* \|	Merge commit 'qt/master-stable'	Jason Barron	2009-08-04	1	-2/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
\| * \|	Port of Qt to VxWorks	Robert Griebl	2009-07-29	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes Qt work on VxWorks 6.6+ in native (kernel) mode. * compiles with the WindRiver GNU toolchain (Linux only) * works with QWS (tested with the VNC driver only) * tested on PPC hardware and the x86 VxWorks simulator * no q3support, no phonon, no webkit * no QSharedMemory, no QSystemSemaphore, no QProcess * only one QApplication instance (flat address space) * filesystem support depends heavily on the quality of the native driver * QLibrary is just a dummy to make plugins work at all * qmake transparently creates VxWorks munching rules for static ctors * made auto-test cope with missing OS features A special note regarding the Q_FOREACH patch for dcc: when calling foreach(a,c) with c being a function returning a container, the compiler would generate 5 references to some labels (.LXXXX), which are not there (so the linker complains in the end). Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>' statement Reviewed-By: Harald Fernengel
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-28	2	-8/+7
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
\| * \|	qdoc: Fixed all references to obsolete QHttp classes.	Martin Smith	2009-07-24	2	-8/+7
\| \| \|
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	5	-38/+20
\|\ \ \ \| \|/ / \| \| / \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
\| *	Forgot to include qnet_unix_p.h for the qt_safe_() functions	Robert Griebl	2009-07-14	1	-0/+1
\| \| \| \| \| \| \| \|	Reviewed-By: TrustMe
\| *	Socket function cleanup: replacing direct POSIX calls with qt_safe_().	Robert Griebl	2009-07-14	2	-12/+11
\| \| \| \| \| \| \| \|	Reviewed-By: Thiago
\| *	Build fix for mingw	Thierry Bastian	2009-07-14	2	-2/+2
\| \| \| \| \| \| \| \| \| \|	we should include qt_windows.h and not windows.h because we have to define WINVER to 0x500.
\| *	Merge commit 'origin/4.5'	Bill King	2009-07-08	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
\| * \|	src/network: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵	miniak	2009-07-01	2	-24/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* \| \|	Merge commit 'origin/master' into 4.6-merged	Jason Barron	2009-07-09	2	-3/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
\| * \ \	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-07-07	1	-1/+1
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
\| \| * \|	Fixed dead code possibly leading to crash.	Rohan McGovern	2009-07-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Looks like this `&&' was meant to be `\|\|'. QNetworkProxy::FtpCachingProxy is 5 so it's clearly impossible for type to be less than 0 and greater than QNetworkProxy::FtpCachingProxy. Reviewed-by: Aaron Kennedy
\| * \| \|	Removed unused static data from Qt.	axis	2009-07-06	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This saves memory and prevents warnings from RVCT.
\| * \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-06-29	24	-48/+48
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
* \| \| \|	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	24	-48/+48
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
\| * \| \|	Fix bad merges	Bradley T. Hughes	2009-06-26	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-06-17	24	-48/+48
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
\| \| * \ \	Merge license header changes from 4.5	Volker Hilsheimer	2009-06-16	24	-48/+48
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	24	-48/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-06-05	2	-1/+2
\| \|\ \ \ \ \| \| \|/ / /
\| * \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-05-29	3	-4/+4
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-05-26	3	-19/+4
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h
\| * \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-05-20	1	-1/+1
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt	Bradley T. Hughes	2009-05-12	1	-0/+9
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵	Bradley T. Hughes	2009-05-08	1	-7/+15
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	windows-7-multitouch
\| * \ \ \ \ \ \ \	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵	Bradley T. Hughes	2009-04-07	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	windows-7-multitouch
\| \| * \ \ \ \ \ \ \	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-01	1	-3/+3
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
\| \| * \| \| \| \| \| \| \| \|	Fix compilation with MS VS 2005	Friedemann Kleint	2009-03-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	compile	Bradley T. Hughes	2009-03-30	1	-1/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	4	-5/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| / \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
\| * \| \| \| \| \| \| \|	Compile when -no-qt3-support is on.	Sarah Smith	2009-06-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As checked in was compiling with QDataStream(QByteArray *, int) and that method is only available when compiling with qt3 support. Reviewed-by: Julian de Bhal
\| * \| \| \| \| \| \| \|	All of Qt's own code compiles with -pedantic now (but pcre and webkit don't ↵	David Faure	2009-06-04	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	seem fixable easily) Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
\| * \| \| \| \| \| \|	improved string operations all over the place	Thierry Bastian	2009-05-28	3	-4/+4
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	used character operations whenever possible better usage of QLatin1String
* \| \| \| \| \| \|	compile without exception support	Harald Fernengel	2009-06-16	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Make Qt exception safer.	Robert Griebl	2009-06-10	8	-22/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* \| \| \| \| \| \|	Fixed incorrect headers.	axis	2009-06-03	1	-1/+31
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-05-25	3	-19/+4
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/io/qfile.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp
\| * \| \| \| \| \|	Fix another compilation breakage introduced by the fix to the	Thiago Macieira	2009-05-23	1	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	compilation breakage introduced in 6c1d7e57. The fix in fc7a43cce did fix the failure, but created another one because qhostinfo_win.cpp also had a copy of qt_sockaddr_in6 Reviewed-by: Jason McDonald
\| * \| \| \| \| \|	Fixed compilation with -qtnamespace	Markus Goetz	2009-05-22	2	-4/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: 254333 Reviewed-by: Andy Shaw <qt-info@nokia.com>
* \| \| \| \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-05-20	1	-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 some typos in the documentation.	Frederik Schwarzer	2009-05-18	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
* \| \| \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-05-18	1	-0/+9
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.