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 branch '4.8-upstream' into master-water	Water-Team	2011-06-29	78	-508/+3258
\|\
\| *	Re-apply licenseheader text in source files for qt4.8	Jyri Tahtela	2011-06-27	7	-77/+77
\| \| \| \| \| \| \| \| \| \| \| \|	New files after previous license change round. Reviewed-by: Trust Me
\| *	Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7	Liang Qi	2011-06-24	5	-11/+35
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
\| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7	Laszlo Agocs	2011-06-20	2	-24/+7
\| \| \|\
\| \| * \|	Qmlshadersplugin examples added.	Marko Niemelä	2011-06-13	3	-11/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm
\| \| * \|	Qmlshadersplugin API documentation enhancements.	Marko Niemelä	2011-06-13	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a link from qml element index, removed some unnecessary doc markings, added missing example image and some other minor fixes. Reviewed-by: Kim Gronholm
\| * \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2011-06-22	1	-18/+23
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: trivial: fix typo in comment changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver disable the Embedded Linux data directory permissions check for QNX skip two subtests that are known to fail on QNX implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends implement POSIX IPC based QSystemSemaphore and QSharedMemory backends add a configure-time check for an IPC support make QProcess really work on QNX make the kernel attempt to emulate an instruction with a misaligned access use RoundRobin scheduler by default on QNX a major refactoring of the mkspecs tree for QNX buildfix for qmake
\| \| * \| \|	docu update for QNX 6.5	Ritt Konstantin	2011-06-21	1	-18/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
\| * \| \| \|	Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt	David Boddie	2011-06-17	5	-18/+54
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
\| * \| \| \|	Doc: Added missing license headers for documentation and examples.	David Boddie	2011-06-08	5	-55/+55
\| \| \| \| \|
\| * \| \| \|	Merge branch '4.8'	David Boddie	2011-06-08	1	-0/+7
\| \|\ \ \ \
\| \| * \| \| \|	Doc: Added a snippet to show how to test the Qt version.	David Boddie	2011-06-03	1	-0/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Doc: Fixed links.	David Boddie	2011-06-07	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team	David Boddie	2011-05-27	3	-76/+401
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	converted to unix txt file	Vladimir Minenko	2011-05-26	1	-218/+218
\| \| \| \| \| \|
\| \| * \| \| \|	try to resolve CRLR problems	Vladimir Minenko	2011-05-26	1	-3/+2
\| \| \| \| \| \|
\| \| * \| \| \|	"TAB character in non-leading whitespace" fixed	Vladimir Minenko	2011-05-26	1	-45/+43
\| \| \| \| \| \|
\| \| * \| \| \|	* fixed trailing- and whitespaces	Vladimir Minenko	2011-05-26	2	-76/+91
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'origin/master'	Vladimir Minenko	2011-05-26	609	-6402/+7975
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/external-resources.qdoc doc/src/getting-started/how-to-learn-qt.qdoc "external-resources.qdoc" manually merged "how-to-learn-qt.qdoc" was unchanged, so it was updated to a new, reworked version from the working area
\| \| * \| \| \| \|	* "How To Learn Qt" is almost complete. Last section is missing	Vladimir Minenko	2011-05-25	3	-134/+439
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Several external and internal (Qt) web links added
\| \| * \| \| \| \|	table of content	Vladimir Minenko	2011-05-13	1	-2/+20
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Doc: Fixed typo.	David Boddie	2011-05-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-18994
\| \| * \| \| \| \|	Fixing potential js hole in the js function for the feedback channel.	Morten Engvoldsen	2011-04-29	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Doc: Fixed typo.	David Boddie	2011-04-28	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Doc: Added a code snippet to clarify the use of a function.	David Boddie	2011-04-28	2	-0/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-18888
\| \| * \| \| \| \|	Squashed commit of the changes from the mobile-examples repository	David Boddie	2011-04-27	21	-63/+165
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(4.7-generated-declarative branch).
\| \| * \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt	David Boddie	2011-04-18	453	-8746/+18188
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/webkit/webkit.pro
\| \| * \| \| \| \| \|	Doc: Added a note about the dll CONFIG option.	David Boddie	2011-04-18	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-587
\| \| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt	David Boddie	2011-03-25	21	-26/+638
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Doc: Added QtWebKit examples from Qt Quarterly 26 and 32.	David Boddie	2011-03-10	7	-0/+681
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt	David Boddie	2011-03-10	115	-1971/+3979
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Doc: Mentioned the QQ Parenthesis article in two examples	Geir Vattekar	2011-01-21	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-15668
\| \| * \| \| \| \| \| \| \|	Doc: Work on GettingStartedQt tutorial	Geir Vattekar	2011-01-21	1	-110/+114
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-16609
\| * \| \| \| \| \| \| \| \|	Doc: Added some more information about visited links in rich text.	David Boddie	2011-05-25	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Doc: Added a note about the <style> element in rich text strings.	David Boddie	2011-05-25	1	-1/+5
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggested-by: Leena Miettinen
\| * \| \| \| \| \| \| \|	Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8	David Boddie	2011-05-24	579	-6013/+5899
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
\| * \| \| \| \| \| \| \| \|	Doc: Added some details to the accessibility events API documentation.	David Boddie	2011-05-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Frederik Gladhorn
\| * \| \| \| \| \| \| \| \|	Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8	David Boddie	2011-05-16	2	-0/+172
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Doc: Fixed qdoc warnings.	David Boddie	2011-05-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Doc: Made an additional change for clarity.	David Boddie	2011-05-11	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-4891
\| * \| \| \| \| \| \| \| \| \|	Doc: Noted that the example will not work as expected with a mouse.	David Boddie	2011-05-11	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-4891
\| * \| \| \| \| \| \| \| \| \|	Doc: Various fixes to documentation, some based on changes in master.	David Boddie	2011-05-11	7	-34/+57
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Doc: Fixed an action assignment in inline code.	David Boddie	2011-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTWEBSITE-229
\| * \| \| \| \| \| \| \| \| \|	Squashed commit of changes from the 4.8-temp branch.	David Boddie	2011-05-11	33	-0/+2136
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Doc: Added links to the configuration options page.	David Boddie	2011-05-05	2	-2/+17
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Doc: Added a note about the dll CONFIG option.	David Boddie	2011-05-04	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-587 (cherry picked from commit b1c421239ddb16a6c259af2298e0608961a1f3ba)
\| * \| \| \| \| \| \| \| \| \|	Doc: Fixed typo.	David Boddie	2011-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-18994 (cherry picked from commit bf0926fff333398660fd51ae6b08699783100057)
\| * \| \| \| \| \| \| \| \| \|	Fixing potential js hole in the js function for the feedback channel.	Morten Engvoldsen	2011-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 85d7d7a572d3a5e7e8795fa9cc7160f1bf266ea4)
\| * \| \| \| \| \| \| \| \| \|	Doc: Fixed typo.	David Boddie	2011-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 7d3e8674a757e351586d0625b8bad1d9cb771e8d)
\| * \| \| \| \| \| \| \| \| \|	Doc: Added a code snippet to clarify the use of a function.	David Boddie	2011-05-04	2	-0/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-18888 (cherry picked from commit 728d4798fa38abf04c682d955abe6325f7599fa0)