Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Doc: Fixed the in-repository licenses for the documentation. | David Boddie | 2010-10-04 | 9 | -45/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files. | |||||
* | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-05 | 1 | -4/+4 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Doc: typographical and spelling errors. | Yann Bodson | 2010-10-01 | 1 | -4/+4 | |
| | |/ | |/| | ||||||
* | | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-04 | 2 | -27/+27 | |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0" | Aaron Kennedy | 2010-09-29 | 1 | -2/+2 | |
| |/ | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones | |||||
| * | Doc: maintainance - fixing grammar and spelling | Morten Engvoldsen | 2010-09-23 | 1 | -25/+25 | |
| | | ||||||
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-21 | 3 | -427/+266 | |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp | |||||
| * | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-16 | 1 | -48/+6 | |
| |\ | ||||||
| | * | Doc: More work on the QML documentation. | David Boddie | 2010-09-14 | 1 | -1/+1 | |
| | | | ||||||
| | * | Doc: Some editing and tidying up. | David Boddie | 2010-09-13 | 1 | -48/+6 | |
| | | | ||||||
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2010-09-16 | 1 | -120/+5 | |
| |\ \ | ||||||
| | * | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵ | Morten Engvoldsen | 2010-09-16 | 1 | -120/+5 | |
| | | | | | | | | | | | | | | | | resources. | |||||
| * | | | Doc: Updated the Mac requirements page. | Geir Vattekar | 2010-09-16 | 1 | -0/+3 | |
| |/ / | | | | | | | | | | Reviewed-by: Morten Engvoldsen | |||||
| * | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-09 | 1 | -7/+7 | |
| |\ \ | | |/ | ||||||
| * | | Merge branch '4.7-oslo1' into 4.7-doc | A-Team | 2010-09-07 | 1 | -4/+0 | |
| |\ \ | ||||||
| * \ \ | Merge commit 'staging-1/4.7' into doc-4.7 | Morten Engvoldsen | 2010-09-03 | 1 | -22/+14 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into ↵ | Morten Engvoldsen | 2010-08-30 | 5 | -1037/+1046 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc-4.7 Conflicts: doc/src/getting-started/examples.qdoc doc/src/index.qdoc | |||||
| * | | | | | Fixed the missing snippet. | Jerome Pasion | 2010-08-25 | 1 | -2/+1 | |
| | | | | | | ||||||
| * | | | | | Small fix. | Jerome Pasion | 2010-08-24 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Cleaned up the install pages. | Jerome Pasion | 2010-08-24 | 1 | -260/+254 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: Morten Engvoldsen | |||||
| * | | | | | Fixed ampersand. | Jerome Pasion | 2010-08-13 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task: QTBUG-12848 | |||||
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 2 | -33/+21 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-07 | 1 | -4/+0 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Doc: Updating known-issues page. | Morten Engvoldsen | 2010-09-06 | 1 | -4/+0 | |
| | | |_|/ | | |/| | | ||||||
| * | | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-03 | 1 | -22/+14 | |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml | |||||
| | * | | | Doc: removing bug breaking the article into pages. These pages was not ↵ | Morten Engvoldsen | 2010-09-01 | 1 | -22/+14 | |
| | | |/ | | |/| | | | | | | | | | linked anywhere. | |||||
| * | | | Doc: qdoc fixes. | David Boddie | 2010-09-02 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-01 | 1 | -5/+5 | |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetext.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp | |||||
| * | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-08-27 | 1 | -0/+4 | |
| |\ \ \ | ||||||
| * | | | | Doc: Fixed links and markup. | David Boddie | 2010-08-27 | 1 | -5/+5 | |
| | | | | | ||||||
* | | | | | Add multicastsender and multicastreceiver examples | Bradley T. Hughes | 2010-09-01 | 1 | -0/+2 | |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | These are clones of the broadcastsender and broadcastreceiver examples, modified to use the multicast API. I've made sure that the examples are linked in the appropriate places as well. | |||||
* | | | | Updated some URLs and required tools versions for Symbian | Miikka Heikkinen | 2010-08-27 | 1 | -5/+5 | |
| |/ / |/| | | | | | | | | Reviewed-by: Janne Koskinen | |||||
* | | | Doc: linking up orphant files | Morten Engvoldsen | 2010-08-23 | 1 | -0/+4 | |
|/ / | ||||||
* | | Doing "import foo.qml" doesn't work in QML anymore | Bea Lam | 2010-08-20 | 1 | -6/+4 | |
| | | | | | | | | Task-number: QTBUG-13042 | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-08-13 | 1 | -0/+9 | |
|\ \ | |/ | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc | |||||
| * | Added documentation for Spectrum Analyzer demo | Gareth Stockwell | 2010-08-11 | 1 | -0/+9 | |
| | | | | | | | | | | Task-number: QTBUG-12720 Reviewed-by: David Boddie | |||||
| * | doc: Changed some titles so lists of contents sort better. | Martin Smith | 2010-08-10 | 1 | -1/+1 | |
| | | ||||||
| * | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-09 | 1 | -6/+11 | |
| | | ||||||
* | | Doc: Removed invalid entities in documentation. | David Boddie | 2010-08-10 | 1 | -2/+2 | |
| | | | | | | | | | | Details: It is not necessary to use entities. In any case, I replaced them with words for consistency. | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-09 | 2 | -2/+8 | |
|\ \ | |/ | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/getting-started/gettingstartedqml.qdoc | |||||
| * | doc: Fixed some missing images. | Martin Smith | 2010-08-06 | 1 | -1/+1 | |
| | | | | | | | | Task-nr: QTBUG-8246 | |||||
| * | Doc: Editied version of QML GS | Morten Engvoldsen | 2010-08-05 | 1 | -25/+21 | |
| | | ||||||
| * | Doc: Adding text to GS page | Morten Engvoldsen | 2010-08-05 | 1 | -1/+7 | |
| | | ||||||
* | | Doc: Fixes to Qt Quick documentation. | David Boddie | 2010-08-09 | 3 | -1030/+1038 | |
|/ | | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team | |||||
* | Doc: updating getting started docs - not finished | Morten Engvoldsen | 2010-08-03 | 3 | -485/+1573 | |
| | ||||||
* | Doc: Adding content to installation guide and fixing printing bugs | Morten Engvoldsen | 2010-08-03 | 1 | -2/+5 | |
| | ||||||
* | Doc: adding changes to getting started and fixing redirection links | Morten Engvoldsen | 2010-08-02 | 1 | -13/+13 | |
| | ||||||
* | Fix missing license header | Olivier Goffart | 2010-07-28 | 1 | -0/+26 | |
| | ||||||
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Geir Vattekar | 2010-07-28 | 1 | -8/+8 | |
|\ | ||||||
| * | Modified file/directory names and text to remove disallowed terminology. | Kevin Wright | 2010-07-27 | 1 | -8/+8 | |
| | |