| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| | |
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:
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |\ |
|
| | | |
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
* Add Japanese hellotr example
|
| | |
|
| |
| |
| |
| | |
and adding highlighting
|
|/
|
|
| |
Task-number: QTBUG-11391
|
|
|
|
| |
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.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits)
Search for QML import libraries also in application directory
Doc improvements
Disable mouse-based selection in TextInput/TextEdit
Rename qml executable to qmlviewer
Don't crash if the target parent is destroyed.
Introduce a threaded interpreter for QML binding bytecode
Bug moved.
doc
doc
Remove image example (covered in class docs)
When changing Loader source, remove old item from scene immediately.
Add missing .qmlproject files
Fix folderlistmodel with qt namespace
Renaming "Qml Launcher" back to "QML Viewer"
Rename some examples: proxyviewer -> networkaccessmanagerfactory,
Regression fix for Loader anchors not working
Make Qt.include() work for js files that have '.pragma library'
doc fix
Improve docs for Qt.quit()
Prevent assignment of values (string, number, bool) to signal handlers.
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change the official name of the qml executable back to "Qt QML Viewer" -
the original name before it got renamed to "QML Runtime" and then
"QML Launcher".
Also, the new Mac OS X bundle name is "QMLViewer" (without a space to ease
command line use).
|
|/
|
|
| |
Fixing index page bugs
|
|
|
|
|
|
|
|
| |
The qml executable was first referred to as QML Viewer, then QML Runtime ...
however, the latter one caused much confusion (see old version of
qmlruntime.qdoc).
Doc changes reviewed by Leena Miettinen.
|
| |
|
|
|
|
| |
Updated Form action
|
|
|
|
| |
Still more to come.
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: Morten Engvoldsen
|
|/
|
|
| |
More to come.
|
| |
|
|
|
|
| |
This change actually changes the left panels. Much more to come.
|
|
|
|
|
|
| |
Changes in css, htmlgenerator (removing redundant class names), updating html templates and updating js.
Reviewed-by: Morten Engvoldsen
|
|
|
|
| |
Much 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
|
| |
|
| |
|
| |
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tools/assistant/tools/assistant/helpviewer.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changed "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation>\n" \
into "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
Reviewed-by: trust me
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tools/qdoc3/test/qdeclarative.qdocconf
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/
|/|
| |
| | |
Also added the infrastructure for generating breadcrumbs.
|
|/
|
|
| |
And this time I also did it for qdeclarative.qdocconf
|
| |
|