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
*	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	12	-7/+98
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Merge branch '4.5'	Thiago Macieira	2009-06-26	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
\| \| *	Fix build on Solaris: test -e isn't available to Bourne shells	Thiago Macieira	2009-06-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't know why, even though it's specified in POSIX. But we have to cope with broken stuff. Reviewed-by: Bradley T. Hughes
\| * \|	Merge branch '4.5'	Thiago Macieira	2009-06-24	1	-1/+2
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qsqldatabase/tst_databases.h
\| \| *	Avoid running "make distclean" before there's a Makefile in the test dir.	Thiago Macieira	2009-06-23	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I have been bitten by this quite often and I had never found out why suddenly configure decided to erase all my build. It happens that my "make" replacement script command tries to search for a Makefile in the parent dirs (so I can run "make" while inside src/corelib/tools), and this caused the whole build to be erased. Reviewed-by: Trust Me
\| * \|	Better detection for OpenVG engines that run on top of OpenGL	Rhys Weatherley	2009-06-24	2	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags on the link line if it is needed by the OpenVG engine. Reviewed-by: trustme
\| * \|	Integrate the OpenVG graphics system into Qt 4.6	Rhys Weatherley	2009-06-22	11	-6/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	4	-1/+17
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Make configure pass the -sdk option on to the configure tests.	Morten Sørvig	2009-06-11	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes sure that we only detect and use libraries that are actually in the SDK. Task-number: 109757 Reviewed-by: Richard Moe Gustavsen
\| * \|	Adds support for linking against iodbc on linux.	Bill King	2009-05-28	2	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If unixodbc detection fails, try and link/detect iodbc libraries and link against them. Reviewed-by: Lincoln Ramsay
\| * \|	Merge branch '4.5' of git@scm.dev.troll.no:qt/qt	Simon Hausmann	2009-05-06	1	-1/+8
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
\| * \|	Make ./configure work better with spaces in path names.	hjk	2009-04-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quote a few variables that may contain spaces. Also, quote spaces in qmake's Makefile dependency section. Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
* \| \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-05-06	1	-1/+8
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Make the Mac configure tests consistent when configuring for multiple ↵	Morten Sørvig	2009-05-05	1	-1/+8
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	architechtures. For example, ./configure -arch x86_64 -arch ppc requires D-Bus compiled for x86_64 and ppc in order to enable it. Task-number: 249881 Reviewed-by: nrc
* \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-04-27	3	-3/+3
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 QMAKE_LIBS_OPENGL_QT in the GL ES config tests	Tom Cooksey	2009-04-03	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The OpenGL ES config tests are there to test if there's enough to build QtOpenGL, not OpenGL applications using Qt. Therefore we should use QMAKE_LIBS_OPENGL_QT rather than QMAKE_LIBS_OPENGL. This is mostely because Qt needs to link against EGL whereas Qt applications do not. Reviewed-by: TrustMe
\| *	Long live Qt 4.5!	Lars Knoll	2009-03-23	109	-0/+1323
\|
*	Long live Qt for S60!	axis	2009-04-24	109	-0/+1331