summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-1610-69/+171
|\
| * Fix game could not be restartedmae2010-08-162-16/+5
| * Handle QGraphicsWidgets in FlickableMartin Jones2010-08-162-1/+38
| * More positioners with QGraphicsWidgets fixes.Martin Jones2010-08-162-2/+50
| * Make positioners work with QGraphicsWidgets alsoMartin Jones2010-08-163-49/+71
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-1610-112/+202
| |\
| * | emit countChanged where appropriate in RepeaterMartin Jones2010-08-162-1/+7
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-162-10/+22
|\ \ \
| * | | diagramscene example: fix leak and crashes.Olivier Goffart2010-08-132-10/+22
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-1622-239/+180
|\ \ \ \
| * \ \ \ Merge remote branch 'staging/4.7' into bearermanagement/maemo-fixesAaron McCarthy2010-08-1612-64/+41
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-1312-64/+41
| | |\ \ \ \ | |/ / / / / |/| | | | |
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-136-9/+28
| | |\ \ \ \
| | | * | | | Cocoa: Stacking order of modal dialogs is wrongRichard Moe Gustavsen2010-08-131-6/+6
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-134-0/+19
| | | |\ \ \ \
| | | | * | | | Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)Prasanth Ullattil2010-08-134-0/+19
| | | * | | | | qdoc: Added the fix to change qml-qml-file.name to qml-file.nameMartin Smith2010-08-131-3/+3
| | | |/ / / /
| | * | | | | Doc: removed assistant style and reintroduced the index page icons.Morten Engvoldsen2010-08-132-41/+4
| | |/ / / /
| | * | | | Make this constructor explicit in Qt too.Aaron McCarthy2010-08-131-4/+0
| | * | | | Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-08-133-10/+9
| | |/ / /
| * | | | Add version 0.42 of libconninet.Aaron McCarthy2010-08-1636-0/+9977
| * | | | Remove version 0.41 of libconninet.Aaron McCarthy2010-08-1639-10054/+0
| * | | | Register QNetworkConfigurationPrivatePointer metatype.Aaron McCarthy2010-08-161-0/+1
| * | | | Mutex is already locked when private member function is called.Aaron McCarthy2010-08-161-3/+2
| * | | | Fixed a typo when doing a lock.Aaron McCarthy2010-08-161-2/+1
| * | | | The QNetworkConfigurationManager did not get the online status correctly even...Tomasz Bursztyka2010-08-162-28/+71
| * | | | Release lock before calling into icd engine.Aaron McCarthy2010-08-161-5/+6
| * | | | Do not change the session configuration state because of changesJukka Rissanen2010-08-161-2/+0
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-135-2/+89
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add autotest that checks that copy and cut don't work when echomode is set to...Joona Petrell2010-08-131-0/+24
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-134-2/+65
| |\ \ |/ / /
| * | Clear previous animation data for non-triggering animations.Michael Brasser2010-08-133-0/+63
| |/
| * Fix configure -help output. declarative module is built by default.Martin Jones2010-08-131-2/+2
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-134-104/+100
|\ \
| * | Clean up rasterfallback mechanism in DirectFBDonald Carr2010-08-122-103/+95
| * | QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-122-8/+15
|\ \ \ | |_|/ |/| |
| * | Make bld.inf target in Symbian mkspecs to depend on .pro fileMiikka Heikkinen2010-08-122-8/+15
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-122-15/+18
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-122-15/+18
| |\ \ \
| | * | | QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-121-14/+17
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Justin McPherson2010-08-12330-8853/+20799
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-08-06172-1975/+4228
| | |\ \ \ \
| | * | | | | Phonon; Update CMakeLists.txtJustin McPherson2010-08-041-1/+1
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-124-5/+31
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Properly emit geometryChanged() when the position change.Alexis Menard2010-08-122-2/+21
| * | | | | | QCoreApplication::library path, ensure mutex lock orderingOlivier Goffart2010-08-121-0/+2
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-121-3/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix memory leak.Sarah Smith2010-08-121-3/+8
| | | |_|/ / | | |/| | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-128-31/+30
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |