| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 4 | -75/+74 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp | ||||
| | * | Doc: fixing unclosed <p> | Morten Engvoldsen | 2010-10-15 | 1 | -1/+1 |
| | | | |||||
| | * | Added Q_INVOKABLE to ignore file. | Jerome Pasion | 2010-10-08 | 1 | -2/+3 |
| | | | | | | | | | | | Task-number: QTBUG-14281 Reviewed-by: David Boddie | ||||
| | * | qdoc: Don't generate html output for png files. | Martin Smith | 2010-10-07 | 1 | -2/+2 |
| | | | |||||
| | * | Doc: Fixed the in-repository licenses for the documentation. | David Boddie | 2010-10-04 | 1 | -5/+5 |
| | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files. | ||||
| | * | Doc: Removed a superfluous comment. | David Boddie | 2010-10-04 | 1 | -1/+0 |
| | | | | | | | | | | | Related to the rejected, but valid merge request: http://qt.gitorious.org/qt/qt/merge_requests/809 | ||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-09-30 | 14 | -89/+68 |
| | |\ | |||||
| | * | | Doc: Fixed non-well-formed table output. | David Boddie | 2010-09-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | Doc: Fixed coding style breakage in qdoc source code. | David Boddie | 2010-09-23 | 1 | -65/+64 |
| | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-07 | 1 | -32/+8 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp | ||||
| | * | | Merge branch '4.7' into newSearch | Morten Engvoldsen | 2010-09-28 | 2 | -47/+19 |
| | |\ \ | |||||
| | | * | | Doc: fixing bugs in slim-fit style | Morten Engvoldsen | 2010-09-28 | 1 | -31/+0 |
| | | | | | |||||
| | * | | | Doc: Implementing new search display | Morten Engvoldsen | 2010-09-24 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-04 | 2 | -18/+21 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp | ||||
| | * | | | Added a condition to skip obsolete functions during the threadness check. | Jerome Pasion | 2010-09-24 | 1 | -16/+19 |
| | |/ / | | | | | | | | | | | | | Reviewed-by: David Boddie Task:QTBUG-13786 | ||||
| | * | | Doc: maintainance - fixing grammar and spelling | Morten Engvoldsen | 2010-09-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-22 | 1 | -4/+4 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | ||||
| | * | | Bump version to 4.7.1. | Jason McDonald | 2010-09-21 | 12 | -40/+40 |
| | |/ | | | | | | | Reviewed-by: Trust Me | ||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-21 | 8 | -61/+56 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp | ||||
| | * | Doc: removing linebreak | Morten Engvoldsen | 2010-09-16 | 1 | -1/+0 |
| | | | |||||
| | * | Doc: correcting html template | Morten Engvoldsen | 2010-09-16 | 1 | -12/+3 |
| | | | |||||
| | * | Merge branch '13092010doc' into doc-4.7 | Morten Engvoldsen | 2010-09-16 | 1 | -4/+4 |
| | |\ | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf | ||||
| | | * | Doc: Removing google analytics from offline docs | Morten Engvoldsen | 2010-09-16 | 2 | -15/+5 |
| | | | | |||||
| | | * | Doc: correcting html template - validating | Morten Engvoldsen | 2010-09-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | Doc: correcting html template | Morten Engvoldsen | 2010-09-16 | 1 | -28/+22 |
| | | | | |||||
| | * | | Revert "Doc: fixing page name bug caused by ↵ | Morten Engvoldsen | 2010-09-15 | 1 | -28/+22 |
| | |/ | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7. | ||||
| | * | git Merge branch '4.7-upstream' into 4.7-doc | Jesper Thomschutz | 2010-09-15 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp | ||||
| | | * | Revert "Doc: fixing page name bug caused by ↵ | Morten Engvoldsen | 2010-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7. | ||||
| | * | | qdoc: Fixed an html formatting error in the QML property list. | Martin Smith | 2010-09-15 | 1 | -21/+1 |
| | | | | |||||
| | * | | Doc: Excluded the libconninet library from the documentation. | David Boddie | 2010-09-08 | 4 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | As discussed with the developers in Brisbane. Reviewed-by: Trust Me | ||||
| | * | | Merge branch '4.7-oslo1' into 4.7-doc | A-Team | 2010-09-07 | 12 | -100/+117 |
| | |\ \ | | |/ | |||||
| | * | | Doc: Added dual documentation license information to the HTML templates. | David Boddie | 2010-09-06 | 3 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | This completes the work to explicitly license the documentation under the GNU Free Documentation License and the Qt Commercial License. Reviewed-by: Trust Me | ||||
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 14 | -124/+142 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf | ||||
| | * | | Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ↵ | Morten Engvoldsen | 2010-09-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | changing qml elements page | ||||
| | * | | Doc: updating the qdocconf files and the stylesheet | Morten Engvoldsen | 2010-09-07 | 12 | -99/+116 |
| | | | | | | | | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly | ||||
| | * | | Doc: Fixing links on index page and corecting HTML in the template. | Morten Engvoldsen | 2010-09-03 | 1 | -1/+1 |
| | |/ | |||||
| | * | QString usage cleanups | Oswald Buddenhagen | 2010-09-01 | 1 | -1/+1 |
| | | | | | | | | | | | - tr() already returns a QString, duh - use multi-arg arg() (heh) | ||||
| | * | make qdoc3 boot-strappable again | Harald Fernengel | 2010-08-30 | 1 | -0/+1 |
| | | | |||||
| | * | Doc: Whitespace fixes. | David Boddie | 2010-08-27 | 1 | -23/+23 |
| | | | |||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-30 | 2 | -6/+16 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp | ||||
| | * | qdoc: Fixed erroneous links to QML basic types. | Martin Smith | 2010-08-25 | 1 | -2/+9 |
| | | | | | | | | | Task-nr: QTBUG-13096 | ||||
| | * | Doc: Updating menu links | Morten Engvoldsen | 2010-08-23 | 1 | -4/+7 |
| | | | |||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 6 | -49/+167 |
| |\ \ | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h | ||||
| | * | Doc: changing template menus to better reflect links from the index page. | Morten Engvoldsen | 2010-08-22 | 1 | -3/+5 |
| | | | |||||
| | * | Doc: Changes to the index page and second level pages linking to the index page. | Morten Engvoldsen | 2010-08-20 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Morten Engvoldsen | 2010-08-20 | 1 | -5/+4 |
| | |\ | |||||
| | | * | qdoc: Changed id attribute to be a UUID. | Martin Smith | 2010-08-20 | 1 | -5/+4 |
| | | | | | | | | | | | | | Task-nr: QTBUG-11113 | ||||
| | * | | Doc: fixing creator bugs, removing menus and textbox in the header | Morten Engvoldsen | 2010-08-20 | 1 | -6/+7 |
| | |/ | |||||
| | * | qdoc: Added more elements to qt.pageindex | Martin Smith | 2010-08-19 | 1 | -0/+29 |
| | | | | | | | | | Task-nr: QTBUG-11113 | ||||
| | * | qdoc3: Added more pagewords & elements to the search index. | Martin Smith | 2010-08-19 | 1 | -3/+3 |
| | | | | | | | | | Task-nr: QTBUG-11113 | ||||
 |
index : 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. |
| summaryrefslogtreecommitdiffstats |