| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html
This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
|
|
|
|
| |
changing qml elements page
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/getting-started/demos.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
|
| | | |
|
| | | |
|
| |/
|/| |
|
| |
| |
| |
| | |
Task-nr: QTBUG-12388
|
| |
| |
| |
| | |
Task-nr: QTBUG-12388
|
| |
| |
| |
| | |
Task-nr: QTBUG-12388
|
| |
| |
| |
| | |
Task-nr: QTBUG-12388
|
|/
|
|
| |
Task-nr: QTBUG-12388
|
|\ |
|
| | |
|
|/
|
|
| |
style files
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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).
|
|
|
|
|
|
| |
Geir will replace it soon with a link to a new "Getting Started" page.
Task-number: QTBUG-12176
|
|\
| |
| |
| |
| | |
Conflicts:
tools/qdoc3/test/qt.qdocconf
|
| | |
|
|/
|
|
| |
Reviewed-by: Trust Me
|
| |
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
| |
Still more to come.
|
|
|
|
| |
Still more to come.
|
|
|
|
| |
More to come.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
index.qdoc updated the HTML to use sprites
images - deleted obsolete images from templates/images
images - added new images to templates/images
styles.css - updated styles to handle index, sprites and templates correct.
assistant.qdoconf - updates images
designer.qdoconf - updates images
linguist.qdoconf - updates images
declarative.qdoconf - updates images
qmake.qdoconf - updates images
qt-build-docs.qdoconf - updates images
qt-build-docs_zh_CN.qdoconf - updates images
qt-defines.qdoconf - updates images
qt.qdoconf - updates images
qt_zh_CN.qdoconf - updates images
qt-htmlTemplates.qdoconf - updated template to use sprites
declarativeui.qdoc - removed <br>
Reviewed-by: Trust Me
|
|
|
|
| |
This page will be changed quite a lot soon.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
This reverts commit d88dade723d5ddd86eea70ee4bf636c06b9f3962.
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
|
|
| |
Adding some image files.
Reveiwed-by: trustme
|
|
|
|
| |
Very cool.
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Sales and Legal
|
|\
| |
| |
| |
| |
| |
| |
| | |
git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic
Conflicts:
src/xmlpatterns/type/qprimitives_p.h
tools/linguist/lupdate/main.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
bin/syncqt
src/corelib/io/qurl.cpp
|
| | |
| | |
| | |
| | | |
name.
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
kinetic-declarativeui
Conflicts:
configure.exe
mkspecs/features/qt.prf
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsscene.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
|