| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|
|
|
| |
Task-number: QTBUG-13451
|
|
|
|
|
|
|
|
|
| |
This required a certain amount of refactoring to make the new
variable visible to the relevant parts of the code. I also moved
the fullDocumentLocation() function into the HtmlGenerator class,
where it belongs.
Task-number: QTBUG-17071
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| | |
| | |
| | |
| | |
| | | |
Use the QtDeclarative parser instead of Qt Creator's QML parser.
Split the QML visitor into documentation and markup visitors.
The code marker used for each file is now determined from its extension.
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
...and a set of functional group pages.
|
|\ |
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tools/qdoc3/htmlgenerator.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Martin Smith
|
|/ /
| |
| |
| | |
Task-number: QTBUG-11512
|
|/
|
|
| |
Task-number: QTBUG-12038
|
|\ |
|
| |
| |
| |
| |
| |
| | |
Output Q_PROPERTY as a cxxVariable.
Task-number: QTBUG-11391
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
Some of the cxxVariable stuff for properties.
Task-number: QTBUG-11391
|
| | |
|
| |
| |
| |
| |
| |
| | |
cxxEnumeration stuff for enum types.
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
|
|
|
|
| |
Fixes "Invalid read of size 4" reported by valgrind.
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
src/gui/text/qstatictext.cpp
|
| |
| |
| |
| |
| |
| | |
"node.cpp", line 1337: Error: There is extra text on this line.
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
tools/qdoc3/generator.cpp
tools/qdoc3/node.cpp
|
| | |
|
|/ |
|
|
|
|
|
| |
I think the crash that occurs when running qdoc over
multiple qdocconf files is fixed.
|
| |
|
|
|
|
|
| |
At this point, no QML qdoc errors appear in the output.
There is still a lot of debug output.
|
|
|
|
| |
Task: QTBUG-8804
|
|
|
|
| |
The crash doesn't happen on my OS X 10.4.
|
|
|
|
|
|
|
|
| |
It doesn't crash on OS X, but it does on some other platforms.
If you run into this crash running qdoc3, you can work around
it by commenting out line 1539 in tools/qdoc3/htmlgenerator.cpp
The line to comment out is:
generateQmlInheritedBy(qml_cn, marker);
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
This allows building documentation even when cross-compiling. Note
that for official documentation, you should always use your host's
qdoc3 binary. This qmake option is for testing whether you introduced
new qdoc warnings even if you don't have a native build around.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/ |
|