| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\ |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/index.qdoc
doc/src/template/style/style.css
tools/qdoc3/atom.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13451
|
| | | | |
|
| | | | |
|
| | |\ \ |
|
| | | | | |
|
| | | | | |
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Style option classes with obsolete variables had no obsolete pages
in the compiled help files because, without other obsolete members
to represent them, those pages were not added to the help project.
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This helps them to be marked up correctly in cases where code
markers are available.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Newlines after comments at the end of files were previously omitted.
An assumption about the type code being quoted caused incorrect CSS
classes to be used and extra HTML elements to be used.
|
| | | | |
|
| | | | |
|
| | |\ \ |
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (165 commits)
Changing header or footer failed to delete the previous.
Avoid index-out-of bounds related crash in Grid
Move Qt.application docs into Qt global object page
Add initial size to ListView in FolderListModel example
update What's New for QtQuick 1.1 and AnimatedImage docs
Improve docs on Item::visible and Item::opacity
Make sure we update Loader size if item size changes after creation.
Froze two more symbols and fixed compilation error (QtQuick11).
PinchArea sometimes failed.
Froze Symbian def files for QtQuick11.
Clarify that IntValidator performs locale specific validation.
Add a mouseSelectionMode property to TextEdit and TextInput.
Add missing versioning tests for new QtQuick 1.1 properties/methods.
Use qobject_cast rather than dynamic_cast.
expect fail for some PinchArea tests on mac
Allow functions to be passed in as values for grouped properties
Fix lineHeight autotests.
Update Docs, Examples and Demos for new CreateObject overloadable
Adding support for group properties in Component::CreateObject()
Update test, versioning is fixed so expect-fail no longer needed
...
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Martin Jones
|
| | | | |\ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number:
Reviewed-by: Martin Jones
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Basically by adding a clear soft key to the currently empty right soft key in warninng window in qmlviewer.
Task-number:
Reviewed-by: Martin Jones
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number:
Reviewed-by: Martin Jones
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number:
Reviewed-by: Martin Jones
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Small developer usability improvement
Task-number:
Reviewed-by: Bea Lam
|
| | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-10800
Reviewed-by: Christopher Ham
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-16353
Reviewed-by: Christopher Ham
|
| | | | |\ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Developers that want to debug qml on their device have to now install
qmlviewer.sis.
Reviewed-by: Christiaan Janssen
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: ossi
|
| | | | |_|_|/ /
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
In a rare case when breaking a layout might
make widgets overlap, the internal heuristic
failed when recreating an original layout during undo.
Some widgets were removed from the grid.
The patch fixes this heuristic (makes sure
we don't remove other widgets). Creating
a form layout from overlapping widgets works
better now.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTCREATORBUG-3616
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | |/ / / / / / |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This may need to be cherry-picked into the 4.7.2 release.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This may need to be cherry-picked into the 4.7.2 release.
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fall back to Qt if no product name is used.
|
| | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| / / / / /
| | | |/ / / / / |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
In libpng >= 1.5.0, the png_info struct is no longer exported
Merge-request: 1023
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-16176
Reviewed-by: mariusSO
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
the unix configure already got it right
Task-number: QTBUG-15978
Reviewed-by: Alessandro Portale
Reviewed-by: mariusSO
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-15228
Reviewed-by: mariusSO
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-16369
|
| | | | | | | | |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
See task for contributor information.
Task-number: QTBUG-16462
|