summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'staging/4.7' into bearermanagement/maemo-fixesAaron McCarthy2010-08-169-20/+34
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-139-20/+34
| |\
| | * Cocoa: Stacking order of modal dialogs is wrongRichard Moe Gustavsen2010-08-131-6/+6
| | * Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)Prasanth Ullattil2010-08-134-0/+19
| | * 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-131-0/+2
|\ \ | |/ |/|
| * Clear previous animation data for non-triggering animations.Michael Brasser2010-08-131-0/+2
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-133-104/+89
|\ \ | |/ |/|
| * Clean up rasterfallback mechanism in DirectFBDonald Carr2010-08-121-103/+84
| * 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-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-12133-500/+1376
| | |\ \
| | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-08-0682-798/+1108
| | |\ \ \
| | * | | | 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-123-4/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Properly emit geometryChanged() when the position change.Alexis Menard2010-08-121-1/+2
| * | | | | 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
| | | |_|/ | | |/| |
* | | | | Destroy the old runtime system only when existing pixmaps were migrated.Michael Dominic K2010-08-121-1/+3
* | | | | Fixed autotest failure in tst_qgl::clipTest.Samuel Rødal2010-08-121-0/+1
* | | | | Added way to destroy the share widget in the GL graphics system.Samuel Rødal2010-08-122-0/+20
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-126-128/+150
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-116-128/+150
| |\ \ \ \
| | * | | | Fix some #ifdefs to compile for a specific combination of featuress that was ...Trever Fischer2010-08-111-0/+6
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-114-125/+140
| | |\ \ \ \
| | | * | | | 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256Andreas Kling2010-08-111-73/+67
| | | * | | | QXmlStreamReader: avoid unnecessary detachingPeter Hartmann2010-08-111-1/+1
| | | * | | | QSslCertificate: support expiration dates > 2049Peter Hartmann2010-08-111-50/+71
| | | * | | | Doc: Fixing typoMorten Engvoldsen2010-08-111-1/+1
| | * | | | | doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-111-3/+4
| | |/ / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-122-6/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Only modify pixmap cache reply when protected by a mutexAaron Kennedy2010-08-121-1/+1
| * | | | | Fix broken example codeBea Lam2010-08-121-5/+8
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1241-161/+820
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-08-113-17/+30
| |\ \ \ \ \
| | * | | | | Fix typos in docsThomas Zander2010-08-111-3/+3
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1134-136/+487
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'hfw_2nd' into 4.7Jan-Arve Sæther2010-08-116-15/+322
| |\ \ \ \ \ \