summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Dynamic GL support in Quick1's ShaderEffectSourcev5.3.0-alpha1Laszlo Agocs2014-02-201-1/+2
* 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
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-291-1/+1
|\ \ \ | |/ /
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| * | Fix QML file in wigglytext-example.Friedemann Kleint2013-11-221-1/+1
| |/
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-201-1/+6
|\ \ | |/
| * Debugger: Fix debugging with newer Qt Creator'sv5.2.0-rc1Kai Koehne2013-11-111-1/+6
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0828-32/+36
|\ \ | |/
| * tests: fix tst_qdeclarativemoduleplugin::incorrectPluginCase()Liang Qi2013-11-011-3/+7
| * use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
| * tests: replace nokia with qtproject in tst_qdeclarativemodulepluginLiang Qi2013-10-3127-30/+30
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-241-1/+1
|\ \ | |/
| * tests: Replace Q_OS_MACX -> Q_OS_OSXv5.2.0-beta1Sergio Ahumada2013-10-211-1/+1
* | Bump qtquick1 version to 5.3.0Thiago Macieira2013-10-141-1/+1
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-116-8/+12
|\ \ | |/
| * remove stale phonon referenceOswald Buddenhagen2013-09-302-4/+0
| * Remove QtAlgorithms usage from QtQuick1.Friedemann Kleint2013-09-264-4/+12
|/
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1Sergio Ahumada2013-09-18187-28/+32
|\
| * Doc: Move Qt Quick 1 demos and their documentationold/5.1Topi Reinio2013-09-16187-28/+32
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-1/+0
|\ \ | |/
| * Fix compilation for -no-opengl buildKai Koehne2013-09-041-1/+0
* | QmlJs: Fix yet another instance of QmlJsParser...Tobias Hunger2013-09-032-2/+2
* | Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-131-1/+0
* | Doc: several updates to the module page.Jerome Pasion2013-08-061-2/+3
* | Merge branch 'stable' into devSergio Ahumada2013-08-055-111/+136
|\ \ | |/
| * Keyboard input documentation: an event accepted does NOT bubble upJeremy Katz2013-07-311-2/+2
| * Fail tst_qdeclarativeborderimage::mirror() on Windows.Friedemann Kleint2013-07-291-1/+5
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+26
| |\
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-241-0/+26
| * | Stabilize and fix tst_qdeclarativetextedit.Friedemann Kleint2013-07-251-49/+41
| * | Stabilize and fix tst_qdeclarativetextinput on Windows.Friedemann Kleint2013-07-251-59/+62
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-2326-56/+84
|\ \ | |/
| * Use GET method for redirect in QDeclarativeXMLHttpRequest.Friedemann Kleint2013-07-221-0/+5
| * Change domain used in cpp-extensions-example.Friedemann Kleint2013-07-1810-13/+13
| * Fix regression from Qt 4 for deep group propertiesSimon Hausmann2013-07-174-1/+24
| * Replace qt.nokia.com by www.qt-project.org in tests.Friedemann Kleint2013-07-153-10/+10