summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-25608-12159/+7118
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-121-0/+11
|\
| * qmlplugindumper: do not pop up a window if an assert is triggeredv5.3.2Fawzi Mohamed2014-08-011-0/+11
* | Fix Flickable mouse grab issue.Robert Griebl2014-08-061-0/+1
* | Add handling of value-type lists to QDeclarativeExpression::evaluate()Robert Griebl2014-08-052-1/+23
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-1/+4
|\ \ | |/
| * Compile fix: do not use composeMode() if QT_NO_IM is defined.Steffen Imhof2014-07-021-1/+4
* | QDeclarativeError::toString: improve handling of empty urls.David Faure2014-07-2619-56/+58
* | Avoid direct GL calls in Quick1Laszlo Agocs2014-06-272-28/+26
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\ \ | |/
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
* | Fix tst_qdeclarativeapplication on OS XSergio Ahumada2014-06-031-1/+7
* | Fix tst_qdeclarativetextinput::copyAndPaste() for asynchronous clipboard noti...Sergio Ahumada2014-06-031-1/+1
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-06-035-16/+43
|\ \ | |/
| * Don't add the database before verificationv5.3.1stableRob Hoelz2014-05-291-1/+1
| * Fix copy and paste errorFrederik Gladhorn2014-05-141-1/+1
| * Don't use a variable called 'interface'Thiago Macieira2014-05-071-13/+13
| * qmlplugindump: Fix platform plugin specification.Friedemann Kleint2014-05-051-1/+1
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-011-0/+27
| |\
| | * Add 5.3 Changelogv5.3.0-rc1v5.3.0Alan Alpert2014-04-241-0/+27
| * | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-231-1/+1
| |/
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-111-0/+2
|\ \ | |/
| * make QtQuick1 claim plugins of type 'qml1tooling'Oswald Buddenhagen2014-04-071-0/+2
* | Merge remote-tracking branch 'origin/stable' into devIikka Eklund2014-04-012-1/+14
|\ \ | |/
| * Ensure TextEdit's text is vertically aligned after resizing its height.Mitch Curtis2014-03-242-1/+14
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-242-1/+25
|\ \ | |/
| * Correct QDeclarativeTextEdit::positionToRectangle().v5.3.0-beta1Mitch Curtis2014-03-202-1/+25
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-1123-24/+23
|\ \ | |/
| * Fix typos in comments and documentationSergio Ahumada2014-03-0520-20/+20
| * Revert "Dynamic GL support in Quick1's ShaderEffectSource"Laszlo Agocs2014-03-031-2/+1
| * Fix encoding of localized messagesKai Koehne2014-02-272-2/+2
* | Fix MSVC-warnings about double to float truncation.Friedemann Kleint2014-02-256-24/+24
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-241-1/+2
|\ \ | |/
| * Dynamic GL support in Quick1's ShaderEffectSourcev5.3.0-alpha1Laszlo Agocs2014-02-201-1/+2
* | whitespace fixesOswald Buddenhagen2014-02-20513-2478/+2478
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2014-02-171-0/+2
|\
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-121-0/+2
| |\
| | * Fix compiler warning in example.old/5.2Christian Kandeler2014-01-291-0/+2
* | | Prospective build fix after commit f8dbed12266c42785c1e4758eed05833ec035f33 i...Simon Hausmann2014-02-172-1/+11
|/ /
* | Disable build for WinRTMaurice Kalinowski2014-02-041-0/+1
* | Normalize signal & slot signatures in connectionThiago Macieira2014-02-042-7/+7
* | Fix warning about unused variables in getting-started tutorial.Friedemann Kleint2014-01-291-0/+2
* | Fix MSVC-warning about unused variable d in qdeclarativeitem.cpp.Friedemann Kleint2014-01-291-3/+2
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
|\ \ | |/
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
* | Fix autotests expecting a trailing whitespace for qDebug streamKai Koehne2013-12-127-14/+14
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-053-13/+9
|\ \ | |/
| * Merge remote-tracking branch 'origin/release' into stablev5.2.1Frederik Gladhorn2013-12-033-13/+9
| |\
| | * Allow QtDeclarative and QtQml to co-exist at run-timev5.2.0Simon Hausmann2013-11-263-13/+9