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'	Thierry Bastian	2011-04-28	1	-24/+8
\|\
\| *	Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7	Olivier Goffart	2011-04-27	1	-24/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/opengl/qwindowsurface_gl.cpp src/s60installs/eabi/QtGuiu.def
\| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2011-04-26	1	-24/+8
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Input method hints are not correct if using proxy widget Fix for GL graphcics system orientation which Update Symbian platform notes documentation
\| \| \| *	Update Symbian platform notes documentation	Jani Hautakangas	2011-04-26	1	-24/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-17357 Reviewed-by: Jason Barron
* \| \| \|	Removing the "resetInternalData" slot in QAbstractProxyModel	Gabriel de Dietrich	2011-04-26	1	-35/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commits 0916a68056154ecb60e4ea2c79726ab2e49b1532 and 6f1384fcbeea993d5be47590c696de60215b7608. This effectively reverts most of MR 694. Reviewed-by: Olivier
* \| \| \|	Merge branch 'master-upstream'	Thierry Bastian	2011-04-19	453	-8855/+18299
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵	Qt Continuous Integration System	2011-04-18	2	-0/+132
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (163 commits) QLocale: Fixed double to currency string conversion on Mac. Fix qstringbuilder4 test on mac Compile on Mac. Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache" Use the qt_static_metacall in QueuedConnection Fix crash after merge of the native symbian thread branch. Fix bad merge Re-apply part of ba8e5eedf5f40091eb67dd391a7dcaf9299db2f5 Removed useless comment SSL code: introduce new error value for blacklisted certificates Disable DEF files by default for symbian-gcce. HTTP caching internals: fix logic for PreferNetwork and PreferCache Added a consistency check for number of missing symbols in elf2e32. Updated def file after symbol removal. QLocalSocket: fix abort on Windows. QStringBuilder: add operator += for QString and QByteArray Dummy commit to trigger pulse. Fix QMetaObject::indexOfSlot Fix compilation Documentation for the initilize_list constructor ...
\| \| * \ \	Merge earth-team into origin/master'	Olivier Goffart	2011-04-12	85	-360/+4564
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master	axis	2011-04-07	374	-8604/+13678
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/thread/qthread_unix.cpp
\| \| * \ \ \ \	Merge remote branch 'origin/master' into 4.8-earth	Denis Dzyubenko	2011-03-28	12	-18/+459
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	network API: add support for HTTP multipart messages	Peter Hartmann	2011-03-22	2	-0/+132
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds two new classes, QHttpPart and QHttpMultiPart, and two new overloads to QNetworkAccessManager: post(const QNetworkRequest &request, QHttpMultiPart multiPart) and put(const QNetworkRequest &request, QHttpMultiPart multiPart). With those classes, it is possible to do a HTTP POST with a multipart message in a memory-saving way: The data from the parts is not copied when read from a file or another QIODevice. Reviewed-by: Markus Goetz Task-number: QTBUG-6222
\| * \| \| \| \| \| \|	Merge branch 4.7 into qt-master-from-4.7	Qt Continuous Integration System	2011-04-12	2	-0/+34
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| / / \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2011-04-12	2	-0/+34
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Allow enum values to be used as signal parameters ListModel::clear() should not clear roles
\| \| \| * \| \| \| \|	Allow enum values to be used as signal parameters	Bea Lam	2011-04-12	2	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The fix does not work for enums declared outside of the class that emits the signal, since in this case it is not possible to access the metaobject of the class that declared the enum. However the fix makes a special case for the Qt namespace to allow enums in this namespace to be used. Task-number: QTBUG-15983 Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b Reviewed-by: Aaron Kennedy
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7	Olivier Goffart	2011-04-07	85	-360/+4564
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| / / \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
\| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵	Qt Continuous Integration System	2011-04-06	2	-6/+6
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fixed the declarative headers and includes within qdoc. Removed invalid public slots section. Minor feature fix led to refactoring for i18n's sake. Fixed string-int concatenation issue. qdoc: Allowed multiple values for certain metadata tags. qdoc: modified \include to take a 2nd arg, snippet id. Doc: Minor fix to title. Doc: Fixed markup. Doc: Added a missing command. Doc: Removed duplicate documentation. Removed some links and prettified others. Doc: Squashed commit of Roland Wolf's threading tutorial.
\| \| \| * \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	David Boddie	2011-04-05	4	-3/+6
\| \| \| \|\ \ \ \ \
\| \| \| * \ \ \ \ \	Merge branch '4.7' of ../qt-doc-team-threading into 4.7	David Boddie	2011-04-05	2	-6/+6
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/getting-started/tutorials.qdoc
\| \| \| \| * \ \ \ \ \	Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7	David Boddie	2011-03-29	99	-233/+4723
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \|	Doc: Minor fix to title.	David Boddie	2011-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7	David Boddie	2011-03-18	2	-4/+4
\| \| \| \| \|\ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	Doc: Squashed commit of Roland Wolf's threading tutorial.	David Boddie	2011-03-17	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2011-04-04	1	-0/+206
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| / / / / \| \| \| \| \|_\|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix failing autotest XmlListModel should allow types other than application/xml Document using Behaviors with States.
\| \| \| * \| \| \| \| \| \| \|	Document using Behaviors with States.	Michael Brasser	2011-04-04	1	-0/+206
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I74f163cef8caa16cccb158061ec30ffb4e471fd1 Task-number: QTBUG-16856 Reviewed-by: Bea Lam
\| \| * \| \| \| \| \| \| \| \|	Removed mobile demos from the Symbian build in demos.pro	Jerome Pasion	2011-04-01	3	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The demos require QtMobility libraries. Added notices in the demo pages about the requirement. Reviewed-by: Casper van Donderen
\| \| * \| \| \| \| \| \| \| \|	Moved a couple of links into one list.	Jerome Pasion	2011-03-29	1	-3/+1
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Geir Vattekar	2011-03-29	5	-75/+128
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	Added a link to the Debugging Techniques article.	Jerome Pasion	2011-03-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Edited the Tutorials and Examples pages. Renamed links in index.qdoc.	Jerome Pasion	2011-03-25	4	-75/+127
\| \| \| \| \|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a link to the eLearning materials and Creator manual. Reviewed-by: David Boddie
\| \| * \| \| \| \| \| \| \|	Doc: Work on GettingStartedQt tutorial	Geir Vattekar	2011-03-29	1	-110/+114
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-16609
\| \| * \| \| \| \| \| \|	Doc: Work on a11y docs	Geir Vattekar	2011-03-24	3	-33/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-8078
\| \| * \| \| \| \| \| \|	Edited QtWebKit Guide qdoc and added external links.	Jerome Pasion	2011-03-23	5	-752/+546
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'clone_4.7' into 4.7	Jerome Pasion	2011-03-23	76	-138/+4280
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fixed external link in QtWebKit Guide.	Jerome Pasion	2011-03-22	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fixed style issue and replaced image.	Jerome Pasion	2011-03-22	1	-0/+0
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Changed QtWebKit Guide chapter names and fixed a link.	Jerome Pasion	2011-03-22	4	-4/+4
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Changing qt-webpages.qdoc to contain http links. Online version.	Jerome Pasion	2011-03-22	1	-20/+20
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Changed inline code to snippet code.	Jerome Pasion	2011-03-22	2	-4/+3
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Edited QtWebKit Guide.	Jerome Pasion	2011-03-21	6	-538/+749
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7	Jerome Pasion	2011-03-18	3	-5/+5
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Edited Canvas and Storage chapters of QtWebKit guide.	Jerome Pasion	2011-03-18	6	-749/+538
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Edited QtWebKit Guide CSS chapter. Created example links.	Jerome Pasion	2011-03-17	4	-793/+587
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: David Boddie
\| \| \| * \| \| \| \| \| \|	Added Qt WebKit module name into license headers.	Jerome Pasion	2011-03-16	5	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Fixed style issues with QtWebKit guide and examples.	Jerome Pasion	2011-03-15	3	-121/+121
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Adding QtWebKit Guide (BETA).	Jerome Pasion	2011-03-15	64	-0/+4049
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added images, new doc build configurations, and example code.
\| \| \| * \| \| \| \| \| \|	Changed Creator qthelp URL from 2095 to 210.	Jerome Pasion	2011-03-14	1	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: David Boddie
\| \| \| * \| \| \| \| \| \|	Resized images and changed their color mode to reduce file size.	Jerome Pasion	2011-03-10	2	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Whitespace fixes.	Jerome Pasion	2011-03-10	5	-55/+55
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Imported demo documentation and their images.	Jerome Pasion	2011-03-10	8	-34/+225
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed user files
\| \| \| * \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Jerome Pasion	2011-03-09	1	-2/+2
\| \| \| \|\ \ \ \ \ \ \