summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-11-241252-28158/+9756
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-233-6/+6
| |\
| | * Fix build error: specifying full path to pro file is required here.Daniel Molkentin2011-11-233-6/+6
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-231-2/+8
| |\ \ | | |/
| | * Fix manifest install rule on windowsDaniel Molkentin2011-11-231-2/+8
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-11-2316-16/+830
| |\ \
| | * \ Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-11-222-12/+38
| | |\ \
| | | * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-11-172-11/+37
| | | |\ \
| | | | * | DeclarativeDebugServer: Instantiate QPluginLoader on heapAurindam Jana2011-11-171-7/+8
| | | | * | qmlplugindump: Fix dumping empty names for generated QMetaObjects.Christian Kamm2011-11-161-4/+29
| | | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-11-144-17/+127
| | | |\ \ \ | | | | |/ /
| | | | * | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-143-16/+126
| | | | * | qmlplugindump: Add flush to fix output redirection on windows.Christian Kamm2011-11-031-1/+1
| | * | | | Sequential reading not supported.Sarah Smith2011-11-181-3/+0
| | * | | | Fix failing unit tests.Sarah Smith2011-11-173-0/+37
| | * | | | Fix compile with -qtnamespaceSarah Smith2011-11-165-12/+15
| | * | | | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-153-16/+126
| | * | | | Move tga support from Qt3d to Qt.Sarah Smith2011-11-141-7/+7
| | * | | | Move tga support from Qt3d to Qt.Sarah Smith2011-11-1414-4/+755
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-231-3/+3
| |\ \ \ \ \
| | * | | | | QNetworkProxy documentation: mention usage of "http_proxy" variablePeter Hartmann2011-11-221-3/+3
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-2324-39/+88
| |\ \ \ \ \ \
| | * | | | | | Hide png symbols in a namespace for -qt-libpngDaniel Teske2011-11-2224-39/+88
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-221211-28100/+8829
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Add note to declarative calculator exampleDaniel Molkentin2011-11-221-0/+6
| | * | | | | | Help: Add \depends to all declarative examples & demosDaniel Molkentin2011-11-229-9/+147
| | * | | | | | Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-2273-80/+151
| | * | | | | | Fix qdoc output for <dependency> tag.Daniel Molkentin2011-11-221-6/+3
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-2215-24/+100
| | |\ \ \ \ \ \
| | | * | | | | | Fix "make install" for declarative examplesDaniel Molkentin2011-11-2215-24/+100
| | * | | | | | | Change installation location of examples.Casper van Donderen2011-11-2214-30/+30
| | * | | | | | | Add Symbian platform notes.Casper van Donderen2011-11-222-1/+457
| | |/ / / / / /
| | * | | | | | Add C++11 support and QThreadLocalStorage changes to docs.Casper van Donderen2011-11-221-0/+8
| | * | | | | | Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-11-223-0/+22
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-11-211-3/+8
| | | |\ \ \ \ \ \
| | | | * | | | | | qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-211-3/+8
| | | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-11-213-0/+17
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-213-0/+17
| | * | | | | | | | Update the license in the qmlapplicationviewer.Casper van Donderen2011-11-224-152/+152
| | * | | | | | | | Examples: Add Copright headers, Remove stray file.Daniel Molkentin2011-11-225-182/+156
| | * | | | | | | | Compile fix.Daniel Molkentin2011-11-211-2/+1
| | * | | | | | | | Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-2180-158/+774
| | * | | | | | | | Doc: Create relative pathes in Manifest files.Daniel Molkentin2011-11-211-0/+21
| | * | | | | | | | Doc: Copy manifest files to the places where Creator expects them.Daniel Molkentin2011-11-211-1/+14
| | * | | | | | | | Update qrc files.Casper van Donderen2011-11-182-17/+16
| | * | | | | | | | Update qmlapplicationviewer template,Casper van Donderen2011-11-173-146/+115
| | * | | | | | | | cppextensions/qgraphicslayout example correctionsartoka2011-11-172-31/+0
| | * | | | | | | | demos/declarative/snake example correctionsartoka2011-11-172-3/+1
| | * | | | | | | | demos/declarative/webbrowser example modificationsartoka2011-11-1722-3/+209
| | * | | | | | | | demos/declarative/twitter example modificationsartoka2011-11-1730-3/+209