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: Reorganized the QML elements table to be a dictionary...	Martin Smith	2010-08-16	3	-0/+21
\| \| \| \|	...and a set of functional group pages.
*	qdoc: Added the fix to change qml-qml-file.name to qml-file.name	Martin Smith	2010-08-13	1	-3/+3
\|
*	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Martin Smith	2010-08-12	4	-43/+185
\|\
\| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-08-12	9	-25/+125
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
\| \| *	update Russian translations for Qt and tools	Ritt Konstantin	2010-08-11	1	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 2445 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| * \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-08-11	3	-41/+171
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits) Disable minRightBearing optimization in QTextLayout on Mac Added one test for QRegExp QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given. Add text decoration support to QStaticText Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" ...
\| \| * \	Merge commit 'remotes/origin/4.7' into qt47s2	Thomas Zander	2010-08-11	1	-2/+2
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
\| \| * \ \	Merge remote branch 'origin/4.7' into oslo-staging-2/4.7	Olivier Goffart	2010-08-09	17	-151/+218
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
\| \| * \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-08-06	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/declarative/util/qdeclarativeanimation.cpp
\| \| * \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-08-05	10	-11/+294
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Doc: Fixed qdoc warnings.	David Boddie	2010-08-05	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-08-04	69	-1964/+1469
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/examples/qml-examples.qdoc
\| \| * \ \ \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-07-16	46	-798/+342
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-07-12	52	-1496/+5481
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7	David Boddie	2010-06-30	15	-178/+528
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
\| \| * \| \| \| \| \| \| \| \| \|	Doc: Synchronize HTML templates for each language.	David Boddie	2010-06-28	3	-37/+170
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \| \| \| \| \| \| \| \| \| \|	qdoc: All references to -assistant and -base were removed.	Martin Smith	2010-08-12	3	-29/+5
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flags allowed are now -creator and -online. -creator is the default.
* \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	David Boddie	2010-08-11	12	-26/+223
\|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Martin Smith	2010-08-11	1	-3/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	fix loading of module configs	Oswald Buddenhagen	2010-08-11	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698
\| \| * \| \| \| \| \| \| \| \| \|	configure.exe: don't write the QT_NAMESPACE define to .qmake.cache	Joerg Bornemann	2010-08-11	1	-1/+0
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the QT_NAMESPACE=MyNamespace define for us. Task-number: QTBUG-5221 Reviewed-by: ossi
\| * \| \| \| \| \| \| \| \| \|	qdoc: Added list of all members (including inherited) page to QML elements.	Martin Smith	2010-08-11	7	-9/+98
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.	Jerome Pasion	2010-08-09	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewer: David Boddie Task number: QTBUG-11938
\| * \| \| \| \| \| \| \|	Translation work for 4.7	Pierre Rossi	2010-08-06	1	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi
\| * \| \| \| \| \| \| \|	Some french translations	Pierre Rossi	2010-08-06	1	-5/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: gabi
\| * \| \| \| \| \| \| \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Martin Smith	2010-08-06	1	-4/+5
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Morten Engvoldsen	2010-08-06	3	-3/+7
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Doc: Fixing validation bugs	Morten Engvoldsen	2010-08-06	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	doc: Re-introduced next/previous page links in the footer.	Martin Smith	2010-08-06	1	-0/+55
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-Nr: QTBUG-12278
\| * \| \| \| \| \| \| \| \|	doc: Fixed some qdoc errors.	Martin Smith	2010-08-06	1	-2/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-08-06	14	-140/+96
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Designer: Prevent rich text from being copied into style sheets. QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction qdoc: Removed three unused config variables. qdoc: Cleaned up the application option specification and use. Doc: Adding GS QML example files Doc: Images for QML GS Doc: Editied version of QML GS Doc: Adding text to GS page Fix link error when building Bearer application with Qt Mobility Doc: nesting up orphant pages
\| * \| \| \| \| \| \| \| \|	Increase maximum heap size of QML Viewer	Joona Petrell	2010-08-05	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-12029 Reviewed-by: Martin Jones
* \| \| \| \| \| \| \| \|	qdoc: Ensured that text is encoded correctly.	David Boddie	2010-08-10	1	-9/+9
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	qdoc: Fixed non-well-formed markup.	David Boddie	2010-08-09	2	-14/+13
\| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me To-be-really-reviewed-by: Qt Doc Team
* \| \| \| \| \| \| \|	Designer: Prevent rich text from being copied into style sheets.	Friedemann Kleint	2010-08-05	1	-0/+1
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com> Task-number: QTCREATORBUG-1952
* \| \| \| \| \| \|	qdoc: Removed three unused config variables.	Martin Smith	2010-08-05	8	-24/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These no longer do anything in qdocconf files: online = false offline = false creator = true
* \| \| \| \| \| \|	qdoc: Cleaned up the application option specification and use.	Martin Smith	2010-08-05	5	-116/+95
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The flags allowed on the command line are now: -online (default), -base, -assistant (same as -base), and -creator. If you don't specify one of these, you see a warning in the error output telling you that it didn't find an application flag and that it generated online docs by defualt.
* \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-08-04	5	-4/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the remote command delimiter, this has cahnged at some point. Assistant: Revert previous commit, issue was already fixed. fix line endings fix compilation with -plugin-kbd-* Fix typo in docs Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS Fix compilation with QT_NO_DBUS fix inaccurate comment
\| * \| \| \| \| \|	Fix the remote command delimiter, this has cahnged at some point.	kh1	2010-08-04	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck
\| * \| \| \| \| \|	Assistant: Revert previous commit, issue was already fixed.	ck	2010-08-04	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS	Mark Brand	2010-08-04	2	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consistent with QT_LFLAGS_* for other database drivers. Support added to configure shell script and configure.exe. Respect SYBASE and SYBASE_LIBS. Use QT_LFLAGS_TDS in project files. Merge-request: 2416 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-08-04	6	-6/+272
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add support for -runtimegraphicssystem configure option runonphone - catch ctrl-c and terminate remote process before exit Skipped rcomp check on Raptor. Fix package header in cases where VERSION doesn't contain all values
\| * \| \| \| \| \|	Add support for -runtimegraphicssystem configure option	Jason Barron	2010-08-04	1	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It has been requested that we provide a configuration option to specify the default "inner" graphics system that should be used when the runtime graphics system is in use. The argument specified to the option is written to the qconfig.h as QT_DEFAULT_RUNTIME_SYSTEM and this is used to instantiate the default graphics system that will be used by the runtime graphics system. Reviewed-by: Gunnar Sletta
\| * \| \| \| \| \|	runonphone - catch ctrl-c and terminate remote process before exit	Shane Kearns	2010-08-04	5	-2/+260
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trap SIGINT, SIGTERM, SIGHUP, SIGBREAK, SIGQUIT On receiving one of these signals, we first untrap them (so runonphone can be killed by a 2nd ctrl-c if needed), and send a terminate to the TRK launcher. This will kill the remote process if it's running, then disconnect from TRK cleanly. Task-number: QTBUG-12444 Reviewed-by: axis
* \| \| \| \| \|	Assistant: Include QML docs	ck	2010-08-04	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Surprisingly, the QML documentation is not integrated into the Qt docs, so it has to be explicitly included. Task-number: QTBUG-12625 Reviewed-by: kh1
* \| \| \| \| \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Morten Engvoldsen	2010-08-03	2	-1/+48
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7	Jerome Pasion	2010-08-03	12	-79/+137
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Made changes to qdoc to allow it to accept a "style level" flag	Jerome Pasion	2010-08-03	2	-1/+48
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Doc: removing empty links in bread crumb	Morten Engvoldsen	2010-08-03	1	-3/+3
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-08-03	8	-60/+61
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.