| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
| |
Take whitespace before the opening bracket into account, e.g. save the newlines
in function f()\n{}
Task-number: QTBUG-18006
Done by Roberto Raggi
|
| |
|
|
|
|
|
|
|
| |
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
|
| |\
| |
| |
| |
| | |
Conflicts:
tools/qml/qml.pri
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
Autotest: make at least one update before checking if more are needed
Fix warning about id maybe used when uninitialised
Doc: setSslConfiguration also sets the CA certificates
Autotest: check that the type received is the expected one
Attempt to fix symbian 3.1 and 3.2 compile break.
Prevents crashing when ICO file has bad color table value
directfb: fix crash in client/server mode of qws
Make Qt/DirectFB less verbose about failing to load pixmaps.
Autotest: don't use the deprecated signal from QDBusConnectionInterface
Autotest: be nicer to the subprocess and SIGTERM it
Fix warnings in QtDeclarative
Autotest: avoid memory leaks if test fails
QtDBus: Make sure we can receive unknown types
QtDBus meta object: keep methods, signals and props with unknown types
Autotest: add a new test for parsing an introspection with unknown types
Make the QtDBus parser not complain about unknown things
fix-layer-getsurface-result-check-for-screen-size-determination
Bump QtWebKit version to 2.0.2
SSL: fix memory leak when loading certificates on Mac OS X
Add a mutex to protect the access to the QSet.
...
|
| | | | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit auto test failure on windows.
Fix FocusScope example.
Fix compilation on old Symbian platforms
Export symbols from qtestlib required for QtQuickTest
Allow MouseArea to prevent mouse grab begin stolen by Flickable.
Fix QTBUG-17008 XmlListModel blocks Windows system events
Fix TextInput, TextEdit auto test failure on windows and mac.
QDeclarativeDebug: Fix crash when serializing list of QObjects
Update the input context when the pre-edit cursor position changes.
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't leak ScopeChainNode's
Rename 'plugins\qmldebugging' (work around qmake issues)
Correct the "module not installed" error handling
Flickable uses the flick velocity to determine whether to retain grab
Make addImportPath() work for windows paths starting with lower case
Report any exceptions occurring in WorkerScript javascript code
MouseArea docs - link to onCanceled() from onReleased()
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update modules-related tests and docs
CLeanup registers after AddString
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Support seperate versions of installed modules
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Changing header/footer size during creation caused recusion
Ensure section delegates are updated when the section property changes.
Make test compile
Disable lineHeight test while implementing the feature in master properly.
Initialize primitives when creating a new QVariant
modelChanged() should not be emitted until view is repopulated
AnimatedImage does not notify on status change.
Clarify case preservation in QDeclarativeImageProviders
Allow unknown types to be passed opaquely through signals
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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.
...
|
| | | |\ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Animations register to be started when the component is finalized,
but in the case of a binding, the registration doesn't happen until
we are already working with a copy of the finalization list. With this
patch, we no longer work with a copy, but with the actual list.
Change-Id: If460c250d2403590907e9ac854d277db68ba8b2a
Task-number: QTBUG-14042
Reviewed-by: Aaron Kennedy
|
| | |_|_|_|_|_|_|/
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
There is a copy of QDeclarativeListProperty in qgraphicsitem_p.h, which
confused qdoc.
Change-Id: I159b5e51af11a8b5874b0ffeb923cbd67df86d0d
Task-number: QTBUG-17555
|
| | |_|_|_|_|_|/
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-17444
Reviewed-by: Aaron Kennedy
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The not installed error will be issued if, after loading plugins and considering
the contents of qmldir, there are no elements in the particular minor version.
For example, if a plugin/qmldir provides the following types (either from C++ or
as QML files specified in the qmldir file):
Foo 1.1
Bar 1.3
importing versions 1.0, 1.2, or 1.4 will fail with the not installed error.
Change-Id: I8566fda6918cb48936144e67a1ce75add0f160d8
Task-number: QTBUG-17324
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Was causing assert failure on windows if the 'c:' was lower case,
since it was being added to the import path database with a lower
case and thus later lookups with an upper case 'c:' would fail.
This change fixes the check for whether the path refers to a
local path or not.
Task-number: QTBUG-16885
Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877
Reviewed-by: Martin Jones
|
| | |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-17183
Change-Id: I709cca0bdce247ca9250c4f334654e2ff57b0b32
Reviewed-by: Aaron Kennedy
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Added tests for remote imports and fixed/improved examples and
text in the docs.
Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7
|
| | |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Martin Jones
Change-Id: I7bd2806770fe5b86fbc589644107d74981d32abe
|
| | |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \ \ |
|
| | |/ / /
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15905
Reviewed-by: Martin Jones
|
| |/ / /
| | |
| | |
| | | |
Task-number: QTBUG-16683
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-17091
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Previously it was documented as a separate 'Application' element
Reviewed-by: Martin Jones
|
| | | |
| | |
| | |
| | |
| | |
| | | |
To complile on platforms without rtti.
Reviewed-by: Michael Brasser
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Using QDeclarativeProperty::write() works for grouped properties but
stops functions values from being passed in, and using
QScriptValue::setProperty() on the object being created allows functions
to be passed in but doesn't work for grouped properties. This fix
walks down the tree for grouped properties to find the property that
should be set so that functions can be set for grouped property values.
Reviewed-by: Aaron Kennedy
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The QScriptValue overload for Component::CreateObject() should be able
to set group properties. This change also allows for property
binding from Javascript to continue to function.
Task-number: QTBUG-13087
Reviewed-by: Bea Lam
|
| | | |
| | |
| | |
| | | |
Broken by 43b8305367156c1ceb09eb4a056bdae3f325b5eb.
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-13849
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The 'if' check for the value map was inverted. Spelling in warning
was fixed.
Task-number: QTBUG-13087
Reviewed-by: Bea Lam
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Versioning for QtQuick 1.1 was added for invokable method in
component. Full changes are in:
aa40f956bab22678b62f630af97f51f9e8fab9f8
Task-number: QTBUG-13087
Reviewed-by: Bea Lam
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In text, textEdit and textInput, the layout of the text should
automatically align to the right if the it is deemed to be
right-to-left text.
Task-number: QTBUG-15880
Reviewed-by: Bea Lam
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Properties can now be assigned a function that returns the binding
value.
Task-number: QTBUG-14964
Reviewed-by: Aaron Kennedy
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-13451
|
| | | | |
|
| |\ \ \
| | |/
| |/| |
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-16369
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-16526
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Setting the parent of the returned item does not affect its object
ownership so care must be taken to ensure it is not garbage collected.
Task-number: QTBUG-16630
Reviewed-by: Aaron Kennedy
|
| | |/
| |
| |
| | |
Task-number: QTBUG-16131
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| | |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| | |
| |
| |
| | |
Introduced by 488e616b50707e5b37162e6d0cfc71a1ffdf9bef
|
| | |
| |
| |
| |
| |
| |
| | |
QScriptValue::toDateTime() does not work for QTime values.
Task-number: QTBUG-16492
Reviewed-by: Michael Brasser
|
