| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is what you write...
/*!
\example designer/calculatorbuilder
\depends examples/qmlapplicationviewer
\title Calculator Builder Example
This is what you get...
<example name="Calculator Builder Example"
docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html"
projectPath="designer/calculatorbuilder/calculatorbuilder.pro"
imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png">
<description><![CDATA[The Calculator Builder example shows how to create a user interface from
a Qt Designer form at run-time, using the QUiLoader class.]]></description>
<tags>calculator,builder</tags>
<fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen>
<depends>../../examples/qmlapplicationviewer</depends>
</example>
Task-number: QTBUG-22838
|
|
|
|
|
|
|
|
|
|
| |
(The since argument can contain a project name and version, defaulting
to the qdoc project if only a version number is specified.)
Refactored common code into the Generator class.
Fixed \sincelist HTML generation for tables containing only one item.
(cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606)
Reapplied after bad v4.7.4 merge
|
|
|
|
| |
Task-number: QTBUG-20739
|
| |
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
| |
But not the default values part in the config file.
|
| |
|
| |
|
| |
|
|
|
|
| |
Task-number: QTBUG-13451
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/ |
|
| | |
|
|/ |
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: Martin Smith
|
|/
|
|
| |
Task-number: QTBUG-11512
|
|\ |
|
| |
| |
| |
| |
| |
| | |
Output Q_PROPERTY as a cxxVariable.
Task-number: QTBUG-11391
|
|\ \
| |/ |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
More cxxFunction stuff for member functions.
Function parameters and other stuff.
Task-number: QTBUG-11391
|
| |
| |
| |
| |
| |
| | |
More cxxFunction stuff for member functions.
Task-number: QTBUG-11391
|
|\ \
| |/
| |
| | |
into 4.7
|
| |
| |
| |
| |
| |
| | |
Some of the cxxFunction stuff for member functions.
Task-number: QTBUG-11391
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Task-number: QTBUG-11391
|
|
|
|
|
|
| |
Also adds more QML stuff to qt.index.
Task: QTBUG-7724
|
|
|
|
| |
Task: QTBUG-8804
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change caused a crash on several platforms before,
but not on mine, of course. It outputs a list of new
QML elements on the What's New in 4.7 page, and it
outputs the "Inherited by" list on each QML elemnent
page for elements that are inherited by other elements.
I can't see why it should crash anything, but I have
included some debug output. I think the crash might
have something to do with QList<T>, which qdoc3 uses
heavily. If it crashes for you, please get a stack
trace and the debug output.
|
|\ |
|
| |
| |
| |
| |
| |
| | |
This reverts commit 83d7242271cf8196a8133de0406788135e16abbb.
Reviewed-by: Martin Smith
|
|/ |
|
|
|
|
|
|
| |
The listed elements are now links.
Task: QTBUG-8153
|
|
|
|
|
|
| |
But the listed elements are not links yet, just plain text.
Task: QTBUG-8153
|
|
|
|
| |
Task: QTBUG-7877
|
|
|
|
|
|
| |
Also added the \pagekeywords command.
Task: QTBUG-7877
|
|
|
|
| |
Task: QTBUG-7877
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
It just links to an empty page at the moment, i.e., it doesn't
load the images. But I will add that.
Task-number: QTBUG-4484
|
|
|
|
|
|
|
|
| |
...in the \qmlmethod and \qmlsignal commands, and the
corresponding "attached" ones. Previously, the type was
not allowed, but it really should be there, which means
the \qmlmethod and \qmlsignal commands should be updated
throughout.
|
|
|
|
|
|
| |
Note the Invalid Syntax errors for some uses of
\qmlmethod and \qmlsignal. A syntactically correct
signature is now required as the argument.
|
|
|
|
| |
Reviewed-by:Michael Brasser
|