| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (104 commits)
Fixed tst_maketestselftest::tests_pro_files failure
remove nasty hack by using a stricter regexp (for language codes)
cosmetics: quote the dot in the regexp
remove dependency of ts targets on sub-tools
add commit-ts target to commit ts files without line number info
(re-)add 'untranslated' ts targets
more fine-grained ts targets
split qt_help out into an own ts target
Unbreak the Maemo 5 build after the Symbian fix
QNAM HTTP: Fix problem with cached files and metaDataChanged()
Add a testcase for QTBUG-11213 to prevent future regressions.
Autotest: reenable the NTLM proxy test on tst_QTcpSocket
Autotest: add a small, boring test for QAuthenticator
Add documentation for the QAuthenticator options.
Expose the QAuthenticator map of options in the API.
Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader
Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC"
Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa
Add unit tests for QMimeData.
fix qconfig.h reference for shadow builds
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge branch '4.7-upstream' into 4.7
Conflicts:
doc/src/declarative/advtutorial.qdoc
src/declarative/graphicsitems/qdeclarativeloader.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/
|/|
| |
| |
| | |
etc. types to make a more practical example that shows how to do
painting as well. Also includes some tutorial improvments.
|
|/
|
|
| |
Replace the usages of Follows with Behaviors, update docs.
|
|
|
|
|
| |
Task-number: QTBUG-11157
Reviewed-by: Warwick Allison
|
| |
|
|\ |
|
| | |
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix FolderListModel parentFolder property's file drive handling
Add license headers for .qml files.
Also show file/line numbers on XML query errors.
Print warnings for xml query syntax errors
Clean up
Add XmlListModel::get()
|
| |
| |
| |
| |
| |
| |
| | |
Examples get the BSD license, while all other .qml files get the
LGPL/tech-preview license.
Reviewed-by: Trust Me
|
|\ \
| |/ |
|
| |
| |
| |
| | |
QDeclarativeComponent)
|
| |
| |
| |
| |
| |
| |
| | |
That's an error that you get when building a qml plugin for a
Symbian device.
Solution: Add 'TARGET.EPOCALLOWDLLDATA = 1' to the plugin .pro file
|
|/
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
|
| |
subdirectories to make it easier to locate examples for certain
features (e.g. animation) and to distinguish between different types
of examples (e.g. very basic examples vs complex demo-like examples).
|
|\ |
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
|
| |
For graphical objects (the common case) a common mistake is to not
parent a dynamically created item. Since you almost always want to add a
parent, and it's hard for a beginner to diagnose this problem, a parent
is now a required argument and dealt with by the createObject function.
Task-number: QTBUG-10110
|
|
|
|
|
|
|
| |
The Component status enum covers all of these properties already and
removing these also makes the API consistent with Image and Loader.
Note this change only affects the QML Component API; the methods are
still available for QDeclarativeComponent.
|
| |
|
| |
|
| |
|
|\ |
|
| | |
|
|/
|
|
|
|
|
|
|
| |
Also updated examples to still work, and the dynamic example now uses
exceptions a little, to demonstrate that it can be done. Exceptions are
also now filled out with the QML error data.
Task-number: QT-2801
Reviewed-by: Aaron Kennedy
|
| |
|
|
|
|
| |
naming and code style.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
examples/declarative/tutorials/samegame/samegame4/content/samegame.js
|
| | |
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
Task-number: QTBUG-9384
|
| |
|
|
|
|
| |
Task-number: QT-2846
|
|\
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/main.cpp
demos/declarative/minehunt/minehunt.qml
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It's a bit of a waste to have four copies of all of the images. And as
an advanced tutorial throwing in a minor complication like this is
probably beneficial.
Additionally, the background has been replaced by a smaller JPEG
version.
|