| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
fixes/improvements for new QML right-to-left docs
Fix license headers in example code
Write Qt Quick 1.1 right-to-left documentation and examples
Doc fix - QtQuick 1.1 scheduling
|
| | |
| | |
| | |
| | | |
Clarify some of the docs and fix some broken doc links.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-11042
Reviewed-by: Martin Jones
Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
|
| | |
| | |
| | |
| | | |
Change-Id: If19934bf378e5fbc6cb1dce1df2164905e97f0ed
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeView flickers when composited on MeeGo
Re-enable lineHeight tests.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Set Qt::WA_OpaquePaintEvent and Qt::WA_NoSystemBackground for
QDeclarativeView on meego.
Change-Id: I301d2381ae831485d205ff42b0c15b3fa7a73424
Task-number: QTBUG-17173
Reviewed-by: Michael Brasser
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update QML "What's New" docs.
Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.
Fix ListView boundary extents for RTL layout.
Fix compiler warning.
|
| | |
| | |
| | |
| | | |
Change-Id: I80d2247cd05ef71907bbf690e8e68a8860a65d4c
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make the TextInput cursorRectangle relative to the item.
Don't assert if font engine creates new glyphs
Doc: remove experimental GestureArea from contents and add PinchArea
Add QML file for TextEdit positionAt test.
Don't return positions within preedit text from positionAt().
Add an is input method composing property to TextEdit and TextInput.
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I5eb6d2826f673c7067fde1447f25d3fc97b5aa5e
Reviewed-by: Bea Lam
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix FolderListModel test - set folder to one containing files.
Drag over bounds errors when ListView has variable height content
FolderListModel emitted incorrect rowsRemoved range causing crash.
fix/improve docs for new QtQuick 1.1 attributes
Fix test instability.
Document BorderImage::asynchronous
Ensure layout is updated when section property changes.
QDeclarativeDebug: Export needed symbols on Symbian
Add a 'CursorPosition' parameter to TextInput.positionAt().
Fix qmlviewer compilation on old Symbian platforms
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Ensure attributes added in QtQuick 1.1 are marked with the
'\since QtQuick 1.1' tag. Also add links to items listed in the
QtQuick 1.1 section in whatsnew.qdoc.
Task-number: QTBUG-17771
Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-17879
Reviewed-by: David Boddie
|
|/ / / |
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: David Boddie
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: David Boddie
|
|/ / / |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
merge-requests/1113
Conflicts:
doc/src/development/qmake-manual.qdoc
|
| |/
| |
| |
| |
| | |
Merge-request: 1103
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| |\
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update modules-related tests and docs
CLeanup registers after AddString
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added tests for remote imports and fixed/improved examples and
text in the docs.
Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix auto test failure.
PathView regression: dragging the path didn't update currentIndex
Fix docs for variant and list basic types
Add test for importing plugins that contain QML files
Call onAdd() for first items added to ListView and GridView
Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master.
Don't clear pre-edit text when a graphics items loses focus.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
Change-Id: I8da521f05ebc266d91caa582852155b571d5cc63
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make it clear that QML properties never store JavaScript object data,
and that inefficient serialization must be performed when JavaScript
objects are copied to QML properties.
Task-number: QTBUG-16624
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Support seperate versions of installed modules
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QML supports versioned types in modules. There's a version major and a
version minor.
This makes it possible to have a module com.organisation.fancycomponents
with version 1.0, and later you could ship a new module
com.organisation.fancycomponents which contains a more recent version 1.1
or 2.0 AND also the old versions to keep old code running.
This is good.
The problem is that this is difficult with certain QA procedures. It's
hard to verify that a new module is indeed 100% compatible with the
previous versions.
The change extends the import mechanism by adding optional versioning to
the component patch.
With the patch, you can add a new module
com.organisation.fancycomponents.2.0 which will be loaded when the
QML file specifies "import com.organisation.fancycomponents 2.0".
The patch works as follows: if you try to load
com.organisation.fancycomponents in version 2.0, the engine first
looks for com/organisation/fancycomponents.2.0, then for
com/organisation/fancycomponents.2 then for
com.organisation/fancycomponents.
Reviewed-by: Aaron Kennedy
Task-number: QTBUG-16455
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits)
Doc: Fixed a reference to the wrong image.
Fixed a bug that caused marked up inline text to be truncated.
Doc: Renamed an image to ensure that it does not clash with another.
Doc: Fixed QML, unindented snippet.
Doc: Removed unnecessary HTML entity from the title.
Doc: Fixed broken links to the old Symbian Foundation Wiki.
Doc: Updated the copyright statements in the templates.
Doc: Fixing typo
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Doc: Adjusted the font sizes for the offline documentation.
Doc: Added a missing style sheet to the qhp manifest.
Doc: Fixed the qthelp namespace for the Qt documentation.
Doc: including missing pages in overviews.
Doc: Fixed typo in QCoreApplication docs
Fixed whitespace.
Avoid hard-coding product names in page titles.
Doc: Unindented a code snippet.
Doc: Fixed confusing wording of a sentence.
Doc: Fixed a broken link.
Doc: Updated the information about commercial editions of Qt.
...
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | | |
8 instances of raw-html remain.
|
| | | |
| | | |
| | | |
| | | | |
11 instances of raw-html remain.
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Additional merge conflicts fix.
Reviewed-by: David Boddie
|
| | | | | |
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into 4.7
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
doc/src/overviews.qdoc
src/declarative/util/qdeclarativeview.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|