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
*	qmlplugindump: Use command line options with a single dash.	Christian Kamm	2011-05-12	1	-7/+12
\| \| \| \| \| \| \| \|	Keep the old -- options for compatibility. Change-Id: I9c9b0beccc7043cf8b4b654bdba33946abf8c7b6 Task-number: QTBUG-18834 (cherry picked from commit 175382d834142f2a55b4e209af870ab40f741d2d)
*	qmlplugindump: Allow dumping by path without URI.	Christian Kamm	2011-05-12	1	-11/+29
\| \| \| \| \| \| \| \|	This migrates b980a9b9646a89b5b24efeca40926408a71334de from the Qt Creator's copy into the qmlplugindump in Qt. Change-Id: I1ab90f491f5df0e6570aa43a91073e7b332e41df (cherry picked from commit 9fcece7b455b6540a67780cc3874b230e586b7c4)
*	Move qmldump from Qt Creator to Qt.	Christian Kamm	2011-05-12	6	-1/+876
\| \| \| \| \| \| \| \| \| \| \| \|	Also rename it to qmlplugindump. Qmlplugindump is a tool that loads a QML module and prints type information about the types contained in its plugins to the standard output. Reviewed-by: Aaron Kennedy Change-Id: I7c35c34af23adc1c37453393d71e492dedfc6a9b (cherry picked from b5265d4e99e5c90532e190632951070cf1a2b630)
*	Introduced a CONFIG option that enables declarative debug services	Thorbjørn Lindeijer	2011-05-04	2	-4/+1
\| \| \| \| \| \| \| \| \| \| \|	This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Change-Id: I817f22a4ec9226a1ee2d080c1f5bb75d8599a06e Reviewed-by: Martin Jones Reviewed-by: Michael Brasser
*	QmlViewer: Translate UI	Kai Koehne	2011-05-02	7	-126/+142
\| \| \| \| \| \| \| \| \|	Install translators for the Qt & QmlViewer translations. also add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated strings. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14848
*	Merge branch 'master' of ../qt-qml-staging	Michael Brasser	2011-04-14	92	-7024/+24514
\|\
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵	Qt Continuous Integration System	2011-04-09	2	-1/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Allow promoted QWidget's to be buddies. Designer: Specify 'notr' attribute for buttongroup name.
\| \| *	Designer: Allow promoted QWidget's to be buddies.	Friedemann Kleint	2011-04-08	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend check for focusPolicy by promoted check. Task-number: QTBUG-18631
\| \| *	Designer: Specify 'notr' attribute for buttongroup name.	Friedemann Kleint	2011-04-08	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Such that the name does not show up in lupdate.
\| * \|	Merge branch 'qt-master-from-4.7' of ↵	Qt Continuous Integration System	2011-04-09	2	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource Let's not write to the source buffer when blending argb32 on rgb16. make -markuntranslated work without -idbased fix conditional on shell type
\| \| * \	Merge branch 4.7 into qt-master-from-4.7	Qt Continuous Integration System	2011-04-09	2	-2/+2
\| \| \|\ \
\| \| \| * \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2011-04-08	2	-2/+2
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make -markuntranslated work without -idbased fix conditional on shell type
\| \| \| \| * \|	make -markuntranslated work without -idbased	Oswald Buddenhagen	2011-04-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-18625
\| \| \| \| * \|	fix conditional on shell type	Oswald Buddenhagen	2011-04-08	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote branch 'qa-review/master' into qa-staging-master	Rohan McGovern	2011-04-07	2	-2/+2
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Merge qt/qt.git master into qa-team-master	Rohan McGovern	2011-03-24	201	-17423/+9824
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Update copyright year to 2011.	Jason McDonald	2011-01-10	1236	-1246/+1246
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7	Olivier Goffart	2011-04-07	53	-313/+13789
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-qml into 4.7-integration	Qt Continuous Integration System	2011-04-07	1	-0/+3
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlViewer: Enable remote qml debugging QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug
\| \| \| * \| \| \| \|	QmlViewer: Enable remote qml debugging	Kai Koehne	2011-04-06	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to use qmlviewer for profiling. Change-Id: I4bddabceade17260159ff5b46b35072afb204ff6 Task-number: QTBUG-18595 Reviewed-by: Christiaan Janssen
\| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵	Qt Continuous Integration System	2011-04-06	34	-145/+357
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| \| * \| \| \| \|	Fixed the declarative headers and includes within qdoc.	David Boddie	2011-04-05	22	-56/+56
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	David Boddie	2011-04-05	12	-102/+346
\| \| \| \|\ \ \ \ \
\| \| \| \| * \| \| \| \|	qdoc: Allowed multiple values for certain metadata tags.	Martin Smith	2011-04-05	9	-44/+152
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also output mainters for classes in the HTML output, if there are maintainers listed.
\| \| \| \| * \| \| \| \|	qdoc: modified \include to take a 2nd arg, snippet id.	Martin Smith	2011-04-01	4	-33/+123
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	David Boddie	2011-03-29	9	-103/+155
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Removed some links and prettified others.	David Boddie	2011-03-25	1	-12/+26
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵	Qt Continuous Integration System	2011-04-01	37	-243/+13504
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (45 commits) Removed mobile demos from the Symbian build in demos.pro Fixed demo subdirs for mobile examples. qdoc: Updates to the qdoc manual. Moved a couple of links into one list. Doc: Work on GettingStartedQt tutorial Added a link to the Debugging Techniques article. qdoc: Updates to the qdoc manual. qdoc: Added a way to exclude directories from receiving default metadata Edited the Tutorials and Examples pages. Renamed links in index.qdoc. Doc: Update to QStyledItemDelegate::displayText() qdoc: Added default values to config file for DITA Doc: Work on QAudioInput::start() functions. Avoided the use of hard-coded file names. Copied the declarative parser into qdoc3 to avoid dependency issues. qdoc: Don't wrap <image> in <fig> if in an <xref> Doc: Work on a11y docs qdoc: Added <copyright>, <copyryear>, and <copyrholder>. qdoc: Completed metadata handling. Doc: Small update to QImageReader/Writer::supportedImageFomrmats() Edited QtWebKit Guide qdoc and added external links. ...
\| \| \| * \| \| \| \| \| \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Martin Smith	2011-03-30	2	-34/+39
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / \| \| \| \| \|/\| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Jerome Pasion	2011-03-28	1	-53/+38
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7	Jerome Pasion	2011-03-28	2	-34/+39
\| \| \| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	qdoc: Updates to the qdoc manual.	Martin Smith	2011-03-30	1	-25/+71
\| \| \| \| \|_\|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	qdoc: Updates to the qdoc manual.	Martin Smith	2011-03-28	1	-53/+38
\| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	qdoc: Added a way to exclude directories from receiving default metadata	Martin Smith	2011-03-28	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	But it is ifdefed out because I think we won't use it.
\| \| \| * \| \| \| \| \| \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Martin Smith	2011-03-25	20	-35/+12902
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / \| \| \| \| \|/\| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Avoided the use of hard-coded file names.	David Boddie	2011-03-24	1	-34/+70
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Copied the declarative parser into qdoc3 to avoid dependency issues.	David Boddie	2011-03-24	19	-1/+12832
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	qdoc: Added default values to config file for DITA	Martin Smith	2011-03-25	5	-16/+58
\| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also added the handling of these default values: dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all dita.metadata.default.publisher = Nokia dita.metadata.default.copyryear = 2011 dita.metadata.default.copyrholder = Nokia dita.metadata.default.audience = programmer
\| \| \| * \| \| \| \| \|	qdoc: Don't wrap <image> in <fig> if in an <xref>	Martin Smith	2011-03-24	1	-2/+4
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	qdoc: Added <copyright>, <copyryear>, and <copyrholder>.	Martin Smith	2011-03-24	1	-3/+19
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7	Martin Smith	2011-03-24	25	-86/+429
\| \| \| \|\ \ \ \ \ \
\| \| \| \| * \ \ \ \ \	Merge branch 'clone_4.7' into 4.7	Jerome Pasion	2011-03-23	6	-6/+263
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| \| * \| \| \| \| \|	Adopting changes from a merge with qt-doc-team repo, 4.7 branch	Jerome Pasion	2011-03-22	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \| \|	Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7	Jerome Pasion	2011-03-18	5	-321/+382
\| \| \| \| \| \|\ \ \ \ \ \
\| \| \| \| \| * \| \| \| \| \| \|	Edited QtWebKit Guide CSS chapter. Created example links.	Jerome Pasion	2011-03-17	5	-6/+262
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: David Boddie
\| \| \| \| \| * \| \| \| \| \| \|	Adding QtWebKit Guide (BETA).	Jerome Pasion	2011-03-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added images, new doc build configurations, and example code.
\| \| \| * \| \| \| \| \| \| \| \|	qdoc: Completed metadata handling.	Martin Smith	2011-03-24	8	-126/+152
\| \| \| \| \|_\|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	But not the default values part in the config file.
\| \| * \| \| \| \| \| \| \| \|	fix configure.exe option -opengl desktop	Mark Brand	2011-03-31	1	-1/+1
\| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-17997 Merge-request: 1161 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵	Qt Continuous Integration System	2011-04-04	2	-1/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer [Qt Creator integration]: Fix integrated property editor.
\| \| * \| \| \| \| \| \| \|	Designer [Qt Creator integration]: Fix integrated property editor.	Friedemann Kleint	2011-04-04	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Within Qt Creator, properties of types int, bool were always disabled in 4.8 after 99160bb9f851bf02fe5345b5f52217b6c77a57c4 (changed implementation of qFindChild). The Property browser solution is included in 2 different designer libraries by pri (shared part and property editor component), that is, some weak symbols of its Q_OBJECTS are duplicated (see gcc-bug 47877). The manifestation is qFindChild<> failing for QInt/BoolPropertyManager in QtVariantEditorFactory::connectPropertyManager(), qvariantproperty.cpp:1998 (Linux/gcc) in the Qt Creator setup. Work around the issue by using a separate profile containing only the key sequence editor required by the shared part of Qt Designer.