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
*	Fix point drawing in QPainter.	Gunnar Sletta	2010-02-25	1	-1/+1
\|
*	Merge remote branch 'origin/master'	Olivier Goffart	2010-02-24	25	-52/+117
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: configure src/plugins/mediaservices/mediaservices.pro
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-24	24	-57/+124
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QMediaContent test; make sure to use network. Rebuild configure.exe Add -mediaservice argument to configure. Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
\| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-24	24	-57/+124
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Add -mediaservice argument to configure. Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
\| \| \| *	Add -mediaservice argument to configure.	Andrew den Exter	2010-02-24	1	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables building the default media service backend for a platform. Is on by default if the build environment requirements are met and -no-mediaservice disables the option. Reviewed-by: Justin McPherson
\| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-23	23	-46/+111
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
\| \| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-23	23	-46/+111
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
\| \| \| \| \| *	Remove active qDebugs.	Justin McPherson	2010-02-23	12	-42/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change to qWarning where appropriate, otherwise comment Reviewed-by: Dmytro Poplavskiy
\| \| \| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging	Nicholas Young	2010-02-23	18	-28/+212
\| \| \| \| \| \|\
\| \| \| \| \| \| *	Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.	Justin McPherson	2010-02-23	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Nicholas Young
\| \| \| \| \| \| *	Add private header warning.	Justin McPherson	2010-02-23	5	-0/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Kurt Korbatits
\| \| \| \| \| * \|	Added QNetworkRequest constructor to QMediaContent.	Nicholas Young	2010-02-23	2	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now consistent with QMediaResource. Reviewed-by: Dmytro Poplavskiy
\| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵	Qt Continuous Integration System	2010-02-24	1	-2/+0
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: compile fix with namespaces after a broken automatical merge
\| \| * \| \| \| \|	compile fix with namespaces after a broken automatical merge	hjk	2010-02-24	1	-2/+0
\| \| \|/ / / /
* \| \| \| \| \|	Expand indicator would not be displayed after removal of a collapsed item's ↵	Gabriel de Dietrich	2010-02-24	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	child While setting the hasChildren property of QTreeViewItem, "collapsed" and "not visible" were being mistaken. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-7443
* \| \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2	Eskil Abrahamsen Blomfeldt	2010-02-24	2	-5/+6
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make the qpainter test compile under Windows.	Trond Kjernaasen	2010-02-24	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Kim
\| * \| \| \| \| \|	make QtScript compatible with mingw 64	Thierry Bastian	2010-02-24	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Kent Hansen
* \| \| \| \| \| \|	Avoid always detaching QStaticText	Eskil Abrahamsen Blomfeldt	2010-02-24	1	-2/+0
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As a left over from when the d pointer was a plain pointer and not a QExplicitlySharedPointer, we were setting the reference count to 1 on construction. Since QExplicitlySharedPointer handles the ref count, a newly constructed QStaticText would have a ref count of 2, and thus would always detach upon modification. Reviewed-by: Gunnar
* \| \| \| \| \|	WinCE compilation fix	aavit	2010-02-24	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fixed hypersensitive drag on QHeaderViews	Gabriel de Dietrich	2010-02-24	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The header section was in a moving state before the drag actually started. That is, before we moved more than QApplication::startDragDistance(). This could cause a click to be considered as a move in some cases. No auto-test as it would involve dragging. Task-number: QTBUG-7327 Reviewed-by: Olivier
* \| \| \| \| \|	Fix seg-fault when no X11 desktop environment is present	Tom Cooksey	2010-02-24	1	-23/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-By: ossi
* \| \| \| \| \|	Remove comment in drawStaticTextItem() in GL engine	Eskil Abrahamsen Blomfeldt	2010-02-24	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing this comment, as a decision was made. QStaticText is an optimization class. Forcing a fallback for all fonts over a certain size would be to intrusive. People should get to decide for themselves whether to cache the text or not when using QStaticText. They can always fall back to drawText() themselves. Reviewed-by: TrustMe
* \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt	Rhys Weatherley	2010-02-24	75	-14/+14854
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure
\| * \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵	Qt Continuous Integration System	2010-02-24	74	-13/+14852
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (121 commits) Make this function non-static. Make compile on Maemo6. Fix build on Symbian. Change initialization order. Increase try verify timeout. Add locking to bearer code. Fixed qnetworksession test on Mac. Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. ...
\| \| * \| \| \|	Make this function non-static.	Aaron McCarthy	2010-02-23	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵	Qt Continuous Integration System	2010-02-23	74	-13/+14852
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (120 commits) Make compile on Maemo6. Fix build on Symbian. Change initialization order. Increase try verify timeout. Add locking to bearer code. Fixed qnetworksession test on Mac. Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. Simplify. ...
\| \| \| * \| \| \|	Make compile on Maemo6.	Aaron McCarthy	2010-02-23	3	-9/+16
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge remote branch 'staging/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-23	15	-28/+158
\| \| \| \|\ \ \ \
\| \| \| \| * \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵	Qt Continuous Integration System	2010-02-22	74	-13/+14835
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \|_\|_\|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (118 commits) Change initialization order. Increase try verify timeout. Add locking to bearer code. Fixed qnetworksession test on Mac. Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. Simplify. Optimise iterations over QHash. Use snippets. ...
\| \| \| * \| \| \| \|	Fix build on Symbian.	Aaron McCarthy	2010-02-23	3	-2/+12
\| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| \| \| * \| \| \|	Change initialization order.	Aaron McCarthy	2010-02-22	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add locking to bearer code.	Aaron McCarthy	2010-02-22	14	-103/+297
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QNetworkConfigurationManagerPrivate and QBearerEngine derived classes need to be thread-safe.
\| \| \| * \| \| \|	Merge remote branch 'origin/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-22	1121	-65649/+109503
\| \| \| \|\ \ \ \ \| \| \| \| \| \|_\|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/network/access/qnetworkaccessmanager.cpp
\| \| \| * \| \| \|	Allow QNAM to be created as a global variable.	Aaron McCarthy	2010-02-18	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QNetworkConfigurationManager cannot be loaded before QApplication as the plugins it loads may create timers. Which fail because timers can only be created in threads created with QThread.
\| \| \| * \| \| \|	Don't load NetworkManager plugin in NetworkManager is not available.	Aaron McCarthy	2010-02-18	4	-6/+20
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge remote branch 'origin/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-17	15	-74/+86
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	Disable NLA plugin, build generic on win32 and mac.	Aaron McCarthy	2010-02-17	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The NLA plugin locks up on exit for some programs, though not all. Disable for now until cause is found. Always build generic plugin on win32 and mac.
\| \| \| * \| \| \| \|	Fix segfault.	Aaron McCarthy	2010-02-16	1	-14/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	manager may be 0.
\| \| \| * \| \| \| \|	Remove debug output.	Aaron McCarthy	2010-02-16	1	-4/+4
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Don't block forever if no bearer plugins are loaded.	Aaron McCarthy	2010-02-16	1	-0/+5
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Always build generic plugin when building NetworkManager plugin.	Aaron McCarthy	2010-02-16	1	-1/+3
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Add QT_MODULE headers.	Aaron McCarthy	2010-02-15	3	-0/+6
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Change docs: "phone" -> "device".	Aaron McCarthy	2010-02-15	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Remove unused code.	Aaron McCarthy	2010-02-15	2	-59/+0
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Simplify.	Aaron McCarthy	2010-02-15	1	-2/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Optimise iterations over QHash.	Aaron McCarthy	2010-02-15	3	-34/+41
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Use snippets.	Aaron McCarthy	2010-02-15	1	-8/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Reorder members to remove hole.	Aaron McCarthy	2010-02-15	1	-4/+4
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Expand documentation for QNAM::setConfiguration() and friends.	Aaron McCarthy	2010-02-15	1	-4/+29
\| \| \| \| \| \| \| \|