| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These no longer do anything in qdocconf files:
online = false
offline = false
creator = true
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
doc/src/examples/qml-examples.qdoc
|
| | |\ |
|
| | | | |
|
| | | | |
|
| | |/ |
|
| |\ \ |
|
| |\ \ \ |
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* Qt Simulator link missing
* Integration and add-ins (on the front page, link leads to an alternative start page)
* Qt Creator (on the front page link leads to Manual version 1.3)
* Getting Started (on the front page) link broken
* More... (in Global Declarations) link broken
Additionally:
There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly.
I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
|
| |\ \ \ \ \ |
|
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | |
| | | | | | |
| | | | | | | |
Conflicts:
tools/qdoc3/test/qt.qdocconf
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-11512
|
| |\ \ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge branch '4.7-upstream' into 4.7
Conflicts:
doc/src/declarative/advtutorial.qdoc
src/declarative/graphicsitems/qdeclarativeloader.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
|
| | |/ / /
| |/| | |
| | | | |
| | | | | |
Note: Support for creator has been disabled. HTML-generator needs an update.
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
|\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | | |
Conflicts:
src/gui/kernel/qapplication.h
|
| |/ / /
| | | |
| | | |
| | | | |
Reviewed-by: David Boddie
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-11346
|
| | | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket::systemCaCertificates(): have one common case for all Unices
Fixed QX11EmbedContainer.
Improved a bit detection of a touch screen on Windows.
qdoc: Fixed invalid format in the html header.
link glu32 before opengl32
Stopped trying to output QML property list in 2 columns
|
| | | |/
| | |/|
| | | |
| | | | |
Task-number: QTBUG-11803
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a version clash when both qt.qch and qml.qch are loaded
into Qt Creator
Done-with: Daniel Molkentin
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/syncqt
src/gui/text/qtextlayout.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/configure/configureapp.cpp
|
| |\ \ |
|
| | |/ |
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
* Add Japanese hellotr example
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-11391
|
|\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | | |
|
| |/
| |
| |
| | |
and adding highlighting
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Fixing menus and js
|
| |
| |
| |
| |
| |
| | |
Replacing tables with lists in the HTML generator
Adding img to search box
Moving JS from template to script files
|
| |
| |
| |
| | |
Fixed bugs on index page, moved JS from template to script file.
|