| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Fixes for bugs: QTBUG-13362, QTBUG-15738, QTBUG-15921,
QTBUG-18356, QTBUG-18417, QTBUG-18664, QTBUG-21562, QTBUG-22094,
and QTBUG-18741.
|
|
|
|
|
|
|
|
| |
Fixes for bugs: QTBUG-21067, QTBUG-17025, QTBUG-11489, QTBUG-20069,
QTBUG-3563, QTBUG-20089, QTBUG-13983, QTBUG-11820, QTBUG-14732,
QTBUG-14521, QTBUG-9675, QTBUG-18313, QTBUG-18313, QTBUG-11312,
QTBUG-17739, QTBUG-7678, QTBUG-14759, QTBUG-14756, QTBUG-14677,
QTBUG-16164, QTBUG-20721, QTBUG-15562, QTBUG-17029 and QTBUG-18544.
|
|
|
|
|
|
| |
Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section.
Reviewed-by: Kim Gronholm
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
| |
Task-number: QTBUG-18509
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
|
| |
| |
| |
| | |
Clarify some of the docs and fix some broken doc links.
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-11042
Reviewed-by: Martin Jones
Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
|
| |
| |
| |
| | |
Task-number: QTBUG-14580
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/index.qdoc
doc/src/template/style/style.css
tools/qdoc3/atom.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | |
| | |
| | |
| | | |
e.g. \span {id="color-red"} {Color this text only}, not this text.
|
| | |
| | |
| | |
| | | |
8 instances of raw-html remain.
|
| | | |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Additional merge conflicts fix.
Reviewed-by: David Boddie
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/propertybinding.qdoc
doc/src/overviews.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativeview.cpp
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/declarative/elements.qdoc
doc/src/declarative/extending.qdoc
src/declarative/qml/qdeclarativecomponent.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | | |
|
| | | | | | |
|
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | | |
This helps them to be marked up correctly in cases where code
markers are available.
|
| | | | | |
|
|\ \ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Plus other minor doc changes
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number:
Reviewed-by: Alan Alpert
|
|\ \ \ \ \ \ |
|
| |\ \ \ \ \ \ |
|
| | | |_|/ / /
| | |/| | | | |
|
| |/ / / / /
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-14274
|
|/ / / / / |
|
|\ \ \ \ \
| |/ / / /
| | / / /
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/qdeclarativeintro.qdoc
doc/src/declarative/qdeclarativereference.qdoc
doc/src/snippets/declarative/focus/focusColumn.qml
tools/qdoc3/apigenerator.cpp
tools/qdoc3/apigenerator.h
tools/qdoc3/archiveextractor.cpp
tools/qdoc3/bookgenerator.cpp
tools/qdoc3/bookgenerator.h
tools/qdoc3/ccodeparser.cpp
tools/qdoc3/command.cpp
tools/qdoc3/command.h
tools/qdoc3/cpptoqsconverter.cpp
tools/qdoc3/dcfsection.cpp
tools/qdoc3/dcfsection.h
tools/qdoc3/jambiapiparser.cpp
tools/qdoc3/jambiapiparser.h
tools/qdoc3/javacodemarker.cpp
tools/qdoc3/javacodemarker.h
tools/qdoc3/javadocgenerator.cpp
tools/qdoc3/javadocgenerator.h
tools/qdoc3/linguistgenerator.cpp
tools/qdoc3/linguistgenerator.h
tools/qdoc3/loutgenerator.h
tools/qdoc3/mangenerator.cpp
tools/qdoc3/mangenerator.h
tools/qdoc3/polyarchiveextractor.cpp
tools/qdoc3/polyarchiveextractor.h
tools/qdoc3/polyuncompressor.cpp
tools/qdoc3/polyuncompressor.h
tools/qdoc3/qsakernelparser.cpp
tools/qdoc3/qscodemarker.cpp
tools/qdoc3/qscodemarker.h
tools/qdoc3/qscodeparser.cpp
tools/qdoc3/qscodeparser.h
tools/qdoc3/sgmlgenerator.cpp
tools/qdoc3/sgmlgenerator.h
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/uncompressor.cpp
tools/qdoc3/webxmlgenerator.cpp
tools/qdoc3/webxmlgenerator.h
|
| | |/
| |/|
| | |
| | | |
Reviewed-by: Trust Me
|
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| |\ |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-15647
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
tools/qdoc3/atom.h
tools/qdoc3/qdoc3.pro
|
| |/
| |
| |
| |
| |
| |
| |
| | |
The 'Writing QML Components' is mainly a restructuring of the
'Extending types from QML' page. It also documents the signal
connect() function that was previously undocumented.
Task-number: QTBUG-15718, QTBUG-15138
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/platforms/compiler-notes.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/ditaxmlgenerator.h
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
tools/qdoc3/pagegenerator.h
|
| | |
|
|/ |
|
|
|
|
| |
QtWebKit Image Analyzer example.
|
| |
|
|
|
|
|
|
|
| |
Originally written by Jervey Kong.
Task-number: QTBUG-14154
Reviewed-by: David Boddie
|
|
|
|
|
|
| |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/graphicsitems/qdeclarativetext.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Twitter is blocking access to the old authentification method that
our demo was using. This breaks the demo completely. To fix this, I
changed the demo into only make use of the public search API. You
can no longer tweet but you can search for different tweets.
At the moment making an oauth capable demo is not desirable due to
the problems with handling a secret app token among other issues.
Task-number: QTBUG-13181
Reviewed-by: Alan Alpert
|