summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge earth-team into origin/master'Olivier Goffart2011-04-1258-318/+13797
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-04-092-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 Kleint2011-04-081-1/+3
| | | | | | | | | | | | | | | | | | Extend check for focusPolicy by promoted check. Task-number: QTBUG-18631
| | * Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2011-04-081-0/+1
| | | | | | | | | | | | Such that the name does not show up in lupdate.
| * | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-092-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.7Qt Continuous Integration System2011-04-092-2/+2
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-082-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 -idbasedOswald Buddenhagen2011-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18625
| | | | * | fix conditional on shell typeOswald Buddenhagen2011-04-081-1/+1
| | | | | |
| * | | | | Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-072-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-24201-17423/+9824
| | |\ \ \ \
| | * | | | | Update copyright year to 2011.Jason McDonald2011-01-101236-1246/+1246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0753-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-integrationQt Continuous Integration System2011-04-071-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 debuggingKai Koehne2011-04-061-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 System2011-04-0634-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 Boddie2011-04-0522-56/+56
| | | | | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0512-102/+346
| | | |\ \ \ \ \
| | | | * | | | | qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-059-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 Smith2011-04-014-33/+123
| | | | | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-299-103/+155
| | | |\ \ \ \ \ \
| | | * | | | | | | Removed some links and prettified others.David Boddie2011-03-251-12/+26
| | | | | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-04-0137-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.7Martin Smith2011-03-302-34/+39
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-281-53/+38
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-282-34/+39
| | | | |\ \ \ \ \ \ \
| | | * | | | | | | | | qdoc: Updates to the qdoc manual.Martin Smith2011-03-301-25/+71
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | qdoc: Updates to the qdoc manual.Martin Smith2011-03-281-53/+38
| | | |/ / / / / / /
| | | * | | | | | | qdoc: Added a way to exclude directories from receiving default metadataMartin Smith2011-03-281-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.7Martin Smith2011-03-2520-35/+12902
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Avoided the use of hard-coded file names.David Boddie2011-03-241-34/+70
| | | | | | | | | |
| | | | * | | | | | Copied the declarative parser into qdoc3 to avoid dependency issues.David Boddie2011-03-2419-1/+12832
| | | | | | | | | |
| | | * | | | | | | qdoc: Added default values to config file for DITAMartin Smith2011-03-255-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 Smith2011-03-241-2/+4
| | | | | | | | |
| | | * | | | | | qdoc: Added <copyright>, <copyryear>, and <copyrholder>.Martin Smith2011-03-241-3/+19
| | | | | | | | |
| | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2425-86/+429
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-236-6/+263
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Adopting changes from a merge with qt-doc-team repo, 4.7 branchJerome Pasion2011-03-223-3/+3
| | | | | | | | | | |
| | | | | * | | | | | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7Jerome Pasion2011-03-185-321/+382
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-175-6/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | | * | | | | | | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added images, new doc build configurations, and example code.
| | | * | | | | | | | | qdoc: Completed metadata handling.Martin Smith2011-03-248-126/+152
| | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | But not the default values part in the config file.
| | * | | | | | | | | fix configure.exe option -opengl desktopMark Brand2011-03-311-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 into earth-masteraxis2011-04-0744-6884/+10895
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-04-042-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 Kleint2011-04-042-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.
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3142-6883/+10890
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-03-2742-6883/+10890
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits) qdoc: Avoid infinite loops in table of contents generation. Removed the documentation from the install rule. qdoc: Added the <othermeta> element. qdoc: Completed changing <section> structure. Doc: Fixed reference to absolete API in exceptionsafety.html Doc: Removed links to obsolete API in QResource Doc: Fixed broken links in QIcon::fromTheme() Doc: Fixed doc bug in undo framework example Doc: Fixed typo. qdoc: Changed <section> structure. Doc: Typo fixes Doc: Fixed snippet documenting QMetaObject::classInfo Doc: Cannot alter SelectionMode of a combobox's view qdoc: Added <publisher> and <permissions> elements. qdoc: Added <component> element to contain the module name. qdoc: Added <prodinfo> element and its contents to the metadata. Doc: Fixed a doc bug in the Rogue example Doc: Small change to QByteArray::resize() Doc: Small change to ListModel docs Doc: QtDemo now gives error message when example doc cannot be loaded ...
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2218-76/+159
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| | | * | | | | | | | qdoc: Avoid infinite loops in table of contents generation.David Boddie2011-03-211-1/+4
| | | | | | | | | | |
generated by cgit v0.12 at 2025-01-22 09:40:40 (GMT)