| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |
| |
| |
| | |
Task-number: QTBUG-15081
|
| |\ |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13939
|
| |/
|/|
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed text rendering bug in raster engine when opacity != 1.0.
Prevented race condition on texture destruction.
More fix for QTBUG-14640:oci performance problem with qlonglong
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
More fix for QTBUG-14640:oci performance problem with qlonglong
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|
| | | | | |
|
|\ \ \ \ \ |
|
| |/ / / /
| | | | |
| | | | |
| | | | | |
Reviewed-by: David Boddie
|
| | | | | |
|
|/ / / /
| | | |
| | | |
| | | | |
Reviewed-by: Martin Smith
|
|\ \ \ \
| |/ / / |
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
qdoc: Added next and previous links to top of pages.
Doc: style tuning
Doc: fixing style - tool buttons to bold.
Doc: updating the template to support search feature better.
Doc: Fixing columns to display all elements in lists - css3
Doc: fixing bugs in style
Doc: fixing style for search display and slim fit menus
Doc: Fixing bug in sorting script for search results.
Doc: Fixed basic language.
Doc: Added Windows Vista to the trademark list.
Doc: Updated the Java trademark information.
Doc: Moved QFileSystemModel example code to the class documentation.
Doc: Corrected the name property as it was incorrectly declared.
|
| | |/
| |/|
| | |
| | |
| | | |
as a side effect, the target is now named html-docs instead of docs to
be consistent with the qt docs.
|
| |/
|/| |
|
| |
| |
| |
| | |
Task-number: QTBUG-14979
|
|/ |
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-14281
Reviewed-by: David Boddie
|
| |
|
|
|
|
|
|
| |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
|
|
|
|
| |
Related to the rejected, but valid merge request:
http://qt.gitorious.org/qt/qt/merge_requests/809
|
|\ |
|
| |\ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: David Boddie
Task:QTBUG-13786
|
| |/ |
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
| |
Reviewed-by: Trust Me
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | |
|
| | |
|
| | |
|
|/
|
|
|
|
|
| |
07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html
This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
|
|\
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qgesturemanager.cpp
|
| |
| |
| |
| |
| |
| |
| | |
07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html
This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
|
| | |
|
| |
| |
| |
| |
| |
| | |
As discussed with the developers in Brisbane.
Reviewed-by: Trust Me
|
|\ \
| |/ |
|
| |
| |
| |
| | |
changing qml elements page
|
| |
| |
| |
| |
| | |
QDocconf files was out of date in the section including extra files
Style now shows numbered lists corectly
|
| | |
|