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 remote branch 'origin/4.7' into qt-master-from-4.7	Olivier Goffart	2011-01-17	36	-36/+36
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
\| *	Update copyright year to 2011.	Jason McDonald	2011-01-10	36	-36/+36
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| *	Bump Qt version to 4.7.2.	Jason McDonald	2010-11-12	5	-5/+5
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	QtCore autotests: make them paralelized.	Olivier Goffart	2010-11-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The filesystem autotests are not paralized (because i was scary) For reference, script I used: cat corelib.pro \| grep -v "=" \| grep \\\\ \| cut -f1 -d\\ \| sed "s/\(.*\) /\1/" \| grep -v file \| xargs -I{} echo "echo CONFIG += parallel_test >> {}/{}.pro" > t . t Reviexed-by: Joao
* \|	Merge remote branch 'origin/4.7' into master-from-4.7	Rohan McGovern	2010-10-04	1	-6/+16
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
\| *	Fixed failure of benchlibcallgrind selftest on some platforms.	Rohan McGovern	2010-09-29	1	-6/+16
\| \| \| \| \| \| \| \| \| \|	This test may be sensitive to the particular toolchain and valgrind versions on the test machine. We'll work around that.
\| *	Bump version to 4.7.1.	Jason McDonald	2010-09-21	5	-5/+5
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Merge remote branch 'origin/4.7' into qt-master-from-4.7	Thiago Macieira	2010-07-01	2	-2/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: bin/syncqt src/gui/text/qtextlayout.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/configure/configureapp.cpp
\| *	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6	Simon Hausmann	2010-06-16	2	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/3rdparty/harfbuzz/src/harfbuzz-shaper.h src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
\| \| *	Bump version number after 4.6.3 release.	Jason McDonald	2010-06-15	7	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \|	Merge remote branch 'origin/4.7' into qt-master-from-4.7	Thiago Macieira	2010-05-04	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	Merge remote branch 'origin/4.6' into qt-4.7-from-4.6	Thiago Macieira	2010-05-01	1	-2/+2
\| \|\ \ \| \| \|/
\| \| *	tst_selftest: Fix off-by-one error in cleaning up line numbers and filenames	Thiago Macieira	2010-04-29	1	-2/+2
\| \| \|
* \| \|	Merge remote branch 'origin/4.7' into qt-master-from-4.7	Thiago Macieira	2010-05-02	104	-263/+18860
\|\ \ \ \| \|/ /
\| * \|	Update the testlib XML baselines with the unit names from QTestLib	Thiago Macieira	2010-04-29	6	-24/+24
\| \| \|
\| * \|	Merge remote branch 'origin/4.6' into qt-4.7-from-4.6	Thiago Macieira	2010-04-29	94	-198/+271
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All EGL-related changes from 4.6 were discarded. Conflicts: src/gui/egl/egl.pri src/gui/egl/qegl.cpp src/gui/egl/qegl_p.h src/gui/egl/qegl_stub.cpp src/gui/egl/qeglproperties_p.h src/gui/egl/qeglproperties_stub.cpp src/gui/gui.pro src/multimedia/multimedia/audio/qaudioinput_win32_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
\| \| *	tst_selftest: parse benchlib results in XML format too	Thiago Macieira	2010-04-28	1	-1/+67
\| \| \|
\| \| *	tst_selftests: replace a line number with __LINE__ in XML too	Thiago Macieira	2010-04-28	1	-10/+17
\| \| \|
\| \| *	tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.	Thiago Macieira	2010-04-28	94	-187/+187
\| \| \| \| \| \| \| \| \| \| \| \|	Otherwise, the tests break when the Qt version changes
\| * \|	Merge remote branch 'origin/4.6' into qt-4.7-from-4.6	Thiago Macieira	2010-04-21	104	-263/+18787
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/openvg/qpaintengine_vg.cpp src/script/bridge/qscriptqobject_p.h tests/auto/bic/tst_bic.cpp
\| \| *	Extend testlib selftest to cover all loggers, not just plain text.	Rohan McGovern	2010-04-19	104	-263/+18787
\| \| \|
\| \| *	Bump version to 4.6.3.	Jason McDonald	2010-02-15	5	-5/+5
\| \| \|
* \| \|	Long live Qt 4.8!	Jason McDonald	2010-04-22	5	-5/+5
\|/ /
* \|	Merge remote branch 'qt/4.6' into qt-master-from-4.6	Qt Continuous Integration System	2010-02-01	2	-3/+3
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
\| *	Autotest: make the test valid for multiple Qt versions	Thiago Macieira	2010-01-26	2	-3/+3
\| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
* \|	BenchLib: update the result format and self-test.	Thiago Macieira	2010-01-27	2	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since BenchLib now uses floating point for its calculations, we should format both the value per-iteration and the total the same way. Otherwise, it would output something like "2e+08" for the total. Reviewed-by: Morten Sørvig
* \|	Remove test binary left behind	Thiago Macieira	2010-01-26	1	-0/+0
\| \|
* \|	Merge branch '4.6'	Thiago Macieira	2010-01-21	1	-2/+2
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
\| *	Bump version to 4.6.2.	Jason McDonald	2010-01-19	6	-7/+7
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Merge branch '4.6'	Thiago Macieira	2010-01-13	36	-36/+36
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
\| *	Update copyright year to 2010	Jason McDonald	2010-01-06	36	-36/+36
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Merge branch '4.6'	Thiago Macieira	2009-12-26	1	-3/+3
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
\| *	Disable benchlibwalltime test.	Rohan McGovern	2009-12-17	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	The test is inherently dependent on the timing behavior of the test machine. For now, it seems too difficult to ensure this works everywhere.
* \|	Merge branch '4.6'	Thiago Macieira	2009-12-02	1	-2/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
\| *	Bump version to 4.6.1	Jason McDonald	2009-12-01	6	-7/+7
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Merge branch '4.6'	Thiago Macieira	2009-10-08	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: tools/assistant/translations/translations_adp.pro
\| *	Skip the crashing selftest on Mac	Olivier Goffart	2009-10-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	The signal handler does seem to work on Mac for segfault Reviewed-by: Rohan McGovern
* \|	Merge branch '4.6'	Olivier Goffart	2009-09-10	1	-6/+6
\|\ \ \| \|/
\| *	Fixed tst_selftests failure.	Rohan McGovern	2009-09-10	1	-6/+6
\| \| \| \| \| \| \| \| \| \|	It's acceptable for the exceptionthrow test to output: terminate called after throwing an instance of `int'
* \|	Merge branch '4.6'	Jason McDonald	2009-09-09	37	-148/+148
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp examples/assistant/simpletextviewer/findfiledialog.h examples/assistant/simpletextviewer/main.cpp examples/assistant/simpletextviewer/mainwindow.cpp examples/assistant/simpletextviewer/mainwindow.h tools/assistant/compat/config.cpp tools/assistant/compat/config.h tools/assistant/compat/docuparser.cpp tools/assistant/compat/docuparser.h tools/assistant/compat/fontsettingsdialog.cpp tools/assistant/compat/fontsettingsdialog.h tools/assistant/compat/helpdialog.cpp tools/assistant/compat/helpdialog.h tools/assistant/compat/helpdialog.ui tools/assistant/compat/helpwindow.cpp tools/assistant/compat/helpwindow.h tools/assistant/compat/index.cpp tools/assistant/compat/index.h tools/assistant/compat/lib/qassistantclient.cpp tools/assistant/compat/lib/qassistantclient.h tools/assistant/compat/lib/qassistantclient_global.h tools/assistant/compat/main.cpp tools/assistant/compat/mainwindow.cpp tools/assistant/compat/mainwindow.h tools/assistant/compat/mainwindow.ui tools/assistant/compat/profile.cpp tools/assistant/compat/profile.h tools/assistant/compat/tabbedbrowser.cpp tools/assistant/compat/tabbedbrowser.h tools/assistant/compat/tabbedbrowser.ui tools/assistant/compat/topicchooser.cpp tools/assistant/compat/topicchooser.h tools/assistant/compat/topicchooser.ui
\| *	Update license headers again.	Jason McDonald	2009-09-09	37	-148/+148
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Finish bumping version number to 4.7.0	Jason McDonald	2009-09-02	5	-5/+5
\|/ \| \| \|	Reviewed-by: Trust Me
*	Update tech preview license header for files that are new in 4.6.	Jason McDonald	2009-08-31	4	-52/+52
\| \| \| \|	Reviewed-by: Trust Me
*	Merge branch '4.5' into 4.6	Thiago Macieira	2009-08-31	33	-429/+429
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
\| *	Update tech preview license header.	Jason McDonald	2009-08-31	34	-442/+442
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| *	Update license headers.	Jason McDonald	2009-08-11	34	-34/+34
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Update contact URL in license headers.	Jason McDonald	2009-08-12	37	-37/+37
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Add QBENCMARK_ONCE to QTestLib.	Morten Sorvig	2009-08-10	2	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The code block associated with QBENCHMARK_ONCE macro will only be executed once, whether the backend returns a valid result or not. The "-iterations" command line argument is also ignored. This is useful for benchmarking code that has side effects. Revby: jasplin
* \|	Merge branch '4.5'	Thiago Macieira	2009-08-03	1	-3/+4
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
\| *	Disable benchlibtickcounter test by default.	Rohan McGovern	2009-07-29	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This test depends on some low-level features of the CPU and the OS scheduler which seem impractical to automatically verify independently of the test. So turn it off to stop its intermittent failures in our test farm.