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
*	qdoc: Fixed reporting of read-only status for QML properties.	Martin Smith	2010-07-22	6	-26/+18
\| \| \| \|	Task-number: QTBUG-11512
*	Silence warning when building with MSVC 2005	Andy Shaw	2010-07-14	1	-1/+1
\| \| \| \|	Reviewed-by: Eskil
*	Fix an Assert in QTextTable	Pierre Rossi	2010-07-14	1	-4/+24
\| \| \| \| \| \| \| \| \|	The problem was caused by the fragment id being inserted in front of a cell spanning over several rows instead of the next logical cell (or fragment_end) in the cells structure. Task-number: QTBUG-11282 Reviewed-by: Simon Hausmann
*	Revert "Fix an Assert in QTextTable"	Aaron McCarthy	2010-07-14	1	-24/+4
\| \| \| \| \| \| \|	This reverts commit b2a4c7f0142a48f60e7ec4fc5866917e3da8b7c3. Unit test tst_qtexttable::QTBUG11282_insertBeforeMergedEnding fails on mac and Linux, reverting for now.
*	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-07-13	56	-392/+733
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits) fix macx not having UNICODE in DEFINES any more doc: Fixed several qdoc warnings. Fix an Assert in QTextTable doc: Fixed several qdoc warnings. QSslSocket: Improve error handling qdoc: Fixed several <div> elements that had the "/>" ending. QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode() qdoc: Fixed breadcrumbs for QML examples. remove redundand translations project files make projects lupdate-friendly Timing fix for slow devices. QNAM: Add future enum attribute for Zerocopy QNAM fixed built-in jpeg and tiff in configure.exe, QTBUG-12093 fix indentation fix build for -no-qt3support Compile fix for bearermonitor example Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. ...
\| *	fix macx not having UNICODE in DEFINES any more	Oswald Buddenhagen	2010-07-13	1	-7/+7
\| \| \| \| \| \| \| \|	and make the cascade a bit nicer on the way ...
\| *	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Martin Smith	2010-07-13	1	-4/+24
\| \|\
\| \| *	Fix an Assert in QTextTable	Pierre Rossi	2010-07-13	1	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem was caused by the fragment id being inserted in front of a cell spanning over several rows instead of the next logical cell (or fragment_end) in the cells structure. Task-number: QTBUG-11282 Reviewed-by: Simon Hausmann
\| * \|	doc: Fixed several qdoc warnings.	Martin Smith	2010-07-13	4	-10/+16
\| \|/
\| *	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Martin Smith	2010-07-13	2	-2/+19
\| \|\
\| \| *	QSslSocket: Improve error handling	Peter Hartmann	2010-07-13	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Markus Goetz Task-number: QT-3567
\| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-07-13	49	-374/+676
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (70 commits) qdoc: Fixed several <div> elements that had the "/>" ending. QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode() qdoc: Fixed breadcrumbs for QML examples. remove redundand translations project files make projects lupdate-friendly Timing fix for slow devices. QNAM: Add future enum attribute for Zerocopy QNAM fixed built-in jpeg and tiff in configure.exe, QTBUG-12093 fix indentation fix build for -no-qt3support Compile fix for bearermonitor example Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. Doc: fixing offline style Fix handling of SSL certificates with wildcard domain names Doc: fixing examples link doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. ...
\| * \| \|	doc: Fixed several qdoc warnings.	Martin Smith	2010-07-13	2	-3/+4
\| \| \|/ \| \|/\|
\| * \|	Fixing merge conflicts.	Martin Smith	2010-07-13	79	-5180/+5874
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
\| * \| \|	QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()	Peter Hartmann	2010-07-13	1	-2/+2
\| \| \| \|
\| * \| \|	QNAM: Add future enum attribute for Zerocopy QNAM	Markus Goetz	2010-07-12	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implementation will follow in 4.7.1 or 4.8, let's see. Reviewed-by: David Boddie Reviewed-by: Simon Hausmann Reviewed-by: Peter Hartmann
\| * \| \|	fix build for -no-qt3support	Peter Hartmann	2010-07-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QString::lower() is QT3_SUPPORT, the correct method is QString::toLower().
\| * \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-07-10	46	-370/+666
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits) Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. Doc: fixing offline style Fix handling of SSL certificates with wildcard domain names Doc: fixing examples link doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. SSL library loading: load system libs only once Revert "SSL backend: load libraries for certificates only once" doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. Doc: Adding support for Qt Creator style doc: Fixed last of the declarative/QML qdoc warnings. qdoc: Marked some missing declarative properties and functions as \internal. qhelpgenerator: Fix namespace syntax checking. ...
\| \| * \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-07-10	46	-370/+666
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits) Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. Doc: fixing offline style Fix handling of SSL certificates with wildcard domain names Doc: fixing examples link doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. SSL library loading: load system libs only once Revert "SSL backend: load libraries for certificates only once" doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. Doc: Adding support for Qt Creator style doc: Fixed last of the declarative/QML qdoc warnings. qdoc: Marked some missing declarative properties and functions as \internal. qhelpgenerator: Fix namespace syntax checking. ...
\| \| \| * \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-07-10	46	-370/+666
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits) Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. Doc: fixing offline style Fix handling of SSL certificates with wildcard domain names Doc: fixing examples link doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. SSL library loading: load system libs only once Revert "SSL backend: load libraries for certificates only once" doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. Doc: Adding support for Qt Creator style doc: Fixed last of the declarative/QML qdoc warnings. qdoc: Marked some missing declarative properties and functions as \internal. qhelpgenerator: Fix namespace syntax checking. ...
\| \| \| \| * \| \|	Add NTLMv2 authentication support to QAuthenticator.	Thiago Macieira	2010-07-09	1	-7/+279
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also fixes a long-standing bug in handling usernames of type "domainname\username", typical of Windows domains, that didn't work with the previous NTLMv1 code. Patch by subcontractor. Task-number: QTBUG-9408, QTBUG-2421, QT-3248 Reviewed-By: Markus Goetz
\| \| \| \| * \| \|	QIODPLB: Sync behavior of ungetBlock() and ungetChar()	Andreas Kling	2010-07-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ungetChar() supports ungetting data that didn't originate from the QIODevicePrivateLinearBuffer, so ungetBlock() should too.
\| \| \| \| * \| \|	QFileIconProvider: Load icons on demand.	Friedemann Kleint	2010-07-09	1	-30/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drawing icons is quite costly and mostly, only 'file' and 'directory' are required. Speeds up application startup considerably. Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
\| \| \| \| * \| \|	Fix QWizard icon and metrics on Windows 7 and Vista	Jens Bache-Wiig	2010-06-18	2	-20/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This patch takes care of missing icon on Windows Vista+7. It also updates the metrics to look more native in both versions. Task-number: QTBUG-9873, QTBUG-11974, QTBUG-6120 Reviewed-by: prasanth
\| \| \| \| * \| \|	Fix handling of SSL certificates with wildcard domain names	Richard J. Moore	2010-07-09	2	-4/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 731 Task-number: QTBUG-4455 Reviewed-by: Peter Hartmann
\| \| \| \| * \| \|	doc: Fixed several qdoc warnings.	Martin Smith	2010-07-09	2	-3/+3
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Martin Smith	2010-07-09	3	-36/+36
\| \| \| \| \|\ \ \
\| \| \| \| \| * \| \|	SSL library loading: load system libs only once	Peter Hartmann	2010-07-09	1	-16/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... and make the loading thread-safe. The global methods for loading the OpenSSL libraries and the system libraries are accessed from within different QSslSocket and QSslConfiguration instances, so they need to be thread-safe. Reviewed-by: Markus Goetz
\| \| \| \| \| * \| \|	Revert "SSL backend: load libraries for certificates only once"	Peter Hartmann	2010-07-09	3	-30/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f2187e31de13a6ab8631a9067487dab555f7c2e7. Reviewed-by: Markus Goetz
\| \| \| \| * \| \| \|	doc: Fixed several qdoc warnings.	Martin Smith	2010-07-09	1	-1/+6
\| \| \| \| \|/ / /
\| \| \| \| * \| \|	doc: Fixed several qdoc warnings.	Martin Smith	2010-07-09	1	-1/+2
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	doc: Fixed several qdoc warnings.	Martin Smith	2010-07-09	1	-6/+6
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	doc: Fixed last of the declarative/QML qdoc warnings.	Martin Smith	2010-07-09	3	-7/+7
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	qdoc: Marked some missing declarative properties and functions as \internal.	Martin Smith	2010-07-09	2	-33/+31
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Corrected paths	Mark Brand	2010-07-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| \| \| \| * \| \|	Change default TapAndHold timeout and make configurable	Thomas Zander	2010-07-08	4	-4/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The new default timeout is 700ms and is what Nokia Research found through usability studies. Nevertheless lets provide public API to set this through a platform plugin or similar. Reviewed-By: Denis
\| \| \| \| * \| \|	Avoid unneeded addition	Thomas Zander	2010-07-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-By: Denis
\| \| \| \| * \| \|	Fix compilation when QT_NO_IM is defined	Tasuku Suzuki	2010-07-08	3	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 734 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| \| \| \| * \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-07-08	26	-263/+175
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) fix build with sqlite2 respect UI_DIR when creating image collections Doc: more cleaning Doc: fixing escape character Doc: cleaning html generator Doc: changing index page Doc: fixing link to devnet Doc: adding HTML class names and style docs to the generator Doc: Fixing typo - background file name doc: Added doc for accessing views and models from delegates. Doc: Fixing broken link Doc: fixing typo Doc: fixing typos qdoc: Fixed table of contents for namespace pages. SSL backend: load libraries for certificates only once immediately set function context when entering a namespace Phonon MediaSource fails to load when passed as a resource file Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default value qdoc: Fixed a few links to QtObject (QML:QtObject) Simplify *= to += after contains() test ...
\| \| \| \| \| * \| \|	fix build with sqlite2	Oswald Buddenhagen	2010-07-08	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	SSL backend: load libraries for certificates only once	Peter Hartmann	2010-07-07	3	-29/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Olivier Goffart
\| \| \| \| \| * \| \|	Phonon MediaSource fails to load when passed as a resource file	Jens Bache-Wiig	2010-07-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Files fail to load when passing resoure path to mediasource. The original regression seems to be caused by a behavior change as reported here: http://bugreports.qt.nokia.com/browse/QTBUG-12015 Note a merge request is also pending on Gitorious http://gitorious.org/phonon/phonon/merge_requests/17 Task-number: QTBUG-9323 Reviewed-by: thierry
\| \| \| \| \| * \| \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Martin Smith	2010-07-07	20	-230/+135
\| \| \| \| \| \|\ \ \
\| \| \| \| \| \| * \| \|	Simplify *= to += after contains() test	Mark Brand	2010-07-07	8	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| \| \| \| \| \| * \| \|	Consolidate sql driver configuration redundancy	Mark Brand	2010-07-07	20	-221/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| \| \| \| \| \| * \| \|	Fixed whitespace formatting	Mark Brand	2010-07-07	9	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| \| \| \| \| * \| \| \|	qdoc: Fixed a few links to QtObject (QML:QtObject)	Martin Smith	2010-07-07	1	-3/+3
\| \| \| \| \| \|/ / /
\| \| \| \| \| * \| \|	Add missing API shims	Kent Hansen	2010-07-07	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There were still a couple of functions that didn't have them. This could cause said functions to crash if multiple script engines were being used. Reviewed-by: Jedrzej Nowacki
* \| \| \| \| \| \| \|	Merge branch 'networkHangFixes' into 4.7-s60	axis	2010-07-13	1	-18/+12
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert "Making network reconnect happen after teardown."	axis	2010-07-13	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1e91d6b79cba488fa5c6f7d954de611903837f76. Should not be necessary anymore after 61daa2f41969688.